• Home
  • History
  • Annotate
  • only in /external/chromium_org/ash/system/chromeos/
History log of /external/chromium_org/ash/system/chromeos/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
29b820f8d84e3bc97d62552e54923c42407f2f29 12-Nov-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.59

This commit was generated by merge_to_master.py.

Change-Id: If9c0c09d8c3a3121b5e75ae9c4c446e4e4baaae6
udio/audio_detailed_view.cc
1320f92c476a1ad9d19dba2a48c72b75566198e9 30-Sep-2014 Primiano Tucci <primiano@google.com> Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
udio/audio_detailed_view.cc
udio/tray_audio_delegate_chromeos.cc
rightness/tray_brightness.cc
rightness/tray_brightness.h
etwork/network_connect.cc
etwork/network_connect.h
etwork/network_state_list_detailed_view.cc
etwork/network_state_notifier_unittest.cc
ower/power_status_unittest.cc
otation/tray_rotation_lock_unittest.cc
upervised/tray_supervised_user.cc
upervised/tray_supervised_user.h
03b57e008b61dfcb1fbad3aea950ae0e001748b0 28-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 291560

This commit was generated by merge_to_master.py.

Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
ulti_user/user_switch_util.cc
ulti_user/user_switch_util.h
ulti_user/user_switch_util_unittest.cc
ray_display.cc
6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 19-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 290040

This commit was generated by merge_to_master.py.

Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
etwork/network_connect.cc
etwork/tray_vpn.cc
ettings/tray_settings.cc
ray_display.cc
ray_display_unittest.cc
ray_tracing.cc
5f1c94371a64b3196d4be9466099bb892df9b88e 12-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854
udio/audio_detailed_view.cc
nterprise/tray_enterprise.cc
nterprise/tray_enterprise.h
anaged/tray_locally_managed_user.cc
anaged/tray_locally_managed_user.h
anaged/tray_locally_managed_user_unittest.cc
etwork/network_state_list_detailed_view.cc
etwork/network_state_list_detailed_view.h
etwork/tray_network.cc
etwork/tray_vpn.cc
ower/power_status.cc
ower/power_status.h
ower/tray_power.cc
ession/logout_button_tray.cc
ettings/tray_settings.cc
upervised/tray_supervised_user.cc
upervised/tray_supervised_user.h
upervised/tray_supervised_user_unittest.cc
ray_caps_lock.cc
ray_display.cc
irtual_keyboard/virtual_keyboard_tray.cc
116680a4aac90f2aa7413d9095a592090648e557 21-Jul-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
EPS
nterprise/enterprise_domain_observer.h
etwork/network_icon.cc
etwork/network_icon.h
etwork/network_icon_animation.cc
etwork/network_icon_animation.h
etwork/network_icon_animation_observer.h
etwork/network_state_list_detailed_view.cc
etwork/network_state_list_detailed_view.h
etwork/network_state_notifier.cc
etwork/network_state_notifier_unittest.cc
etwork/tray_network.cc
etwork/tray_network.h
etwork/tray_network_state_observer.cc
etwork/tray_vpn.cc
otation/tray_rotation_lock_unittest.cc
f8ee788a64d60abd8f2d742a5fdedde054ecd910 20-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
luetooth/bluetooth_notification_controller.cc
rightness/tray_brightness.cc
rightness/tray_brightness_unittest.cc
anaged/tray_locally_managed_user.cc
etwork/network_icon.cc
etwork/network_icon.h
etwork/network_state_list_detailed_view.cc
etwork/network_state_notifier_unittest.cc
ower/power_status_unittest.cc
otation/tray_rotation_lock.cc
otation/tray_rotation_lock.h
otation/tray_rotation_lock_unittest.cc
creen_security/screen_tray_item_unittest.cc
ession/tray_session_length_limit.cc
ray_caps_lock.cc
ray_caps_lock.h
irtual_keyboard/virtual_keyboard_tray.cc
46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd 09-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 275586

This commit was generated by merge_to_master.py.

Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
etwork/network_icon.cc
etwork/network_icon.h
etwork/network_state_notifier_unittest.cc
cedac228d2dd51db4b79ea1e72c7f249408ee061 03-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
etwork/network_connect.cc
etwork/network_icon.cc
etwork/network_state_list_detailed_view.cc
etwork/tray_network.cc
etwork/tray_network_state_observer.cc
etwork/tray_network_state_observer.h
etwork/tray_sms.cc
etwork/tray_vpn.cc
ower/power_status_view.cc
ower/power_status_view.h
ession/tray_session_length_limit.cc
ession/tray_session_length_limit.h
ession/tray_session_length_limit_unittest.cc
ray_display.cc
irtual_keyboard/virtual_keyboard_tray.cc
5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 01-May-2014 Bo Liu <boliu@google.com> Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
etwork/network_connect.cc
ower/power_event_observer.cc
ower/power_status.cc
ower/power_status_unittest.cc
otation/tray_rotation_lock.cc
otation/tray_rotation_lock.h
otation/tray_rotation_lock_unittest.cc
ession/logout_confirmation_controller.cc
ystem_clock_observer.cc
ystem_clock_observer.h
0529e5d033099cbfc42635f6f6183833b09dff6e 24-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
nterprise/tray_enterprise.cc
ower/power_event_observer.cc
ower/power_event_observer.h
ower/power_event_observer_unittest.cc
irtual_keyboard/virtual_keyboard_tray.cc
a02191e04bc25c4935f804f2c080ae28663d096d 16-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
rightness/tray_brightness_unittest.cc
abel_tray_view.cc
etwork/network_connect.cc
otation/tray_rotation_lock.cc
otation/tray_rotation_lock.h
otation/tray_rotation_lock_unittest.cc
ession/logout_button_tray.cc
ray_caps_lock.cc
ray_caps_lock.h
irtual_keyboard/virtual_keyboard_tray.cc
c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c 10-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
udio/audio_detailed_view.cc
udio/audio_detailed_view.h
udio/tray_audio_chromeos.cc
udio/tray_audio_chromeos.h
luetooth/bluetooth_notification_controller.cc
luetooth/bluetooth_notification_controller.h
rightness/tray_brightness.cc
rightness/tray_brightness.h
rightness/tray_brightness_unittest.cc
nterprise/tray_enterprise.cc
nterprise/tray_enterprise.h
abel_tray_view.cc
abel_tray_view.h
anaged/tray_locally_managed_user.cc
anaged/tray_locally_managed_user.h
anaged/tray_locally_managed_user_unittest.cc
etwork/network_detailed_view.h
etwork/network_state_list_detailed_view.cc
etwork/network_state_list_detailed_view.h
etwork/tray_network.cc
etwork/tray_network.h
etwork/tray_network_state_observer.cc
etwork/tray_network_state_observer.h
etwork/tray_sms.cc
etwork/tray_sms.h
etwork/tray_vpn.cc
etwork/tray_vpn.h
ower/power_event_observer.cc
ower/power_event_observer.h
ower/power_event_observer_unittest.cc
ower/power_status.cc
ower/power_status.h
ower/power_status_unittest.cc
ower/power_status_view.cc
ower/power_status_view.h
ower/power_status_view_unittest.cc
ower/tray_power.cc
ower/tray_power.h
ower/tray_power_unittest.cc
ower/user_activity_notifier.cc
ower/user_activity_notifier.h
ower/video_activity_notifier.cc
ower/video_activity_notifier.h
creen_security/screen_capture_tray_item.cc
creen_security/screen_capture_tray_item.h
creen_security/screen_share_tray_item.cc
creen_security/screen_share_tray_item.h
creen_security/screen_tray_item.cc
creen_security/screen_tray_item.h
creen_security/screen_tray_item_unittest.cc
ession/last_window_closed_logout_reminder.cc
ession/last_window_closed_logout_reminder.h
ession/logout_button_tray.cc
ession/logout_button_tray.h
ession/logout_confirmation_controller.cc
ession/logout_confirmation_controller.h
ession/logout_confirmation_controller_unittest.cc
ession/logout_confirmation_dialog.cc
ession/logout_confirmation_dialog.h
ession/tray_session_length_limit.cc
ession/tray_session_length_limit.h
ession/tray_session_length_limit_unittest.cc
ettings/tray_settings.cc
ettings/tray_settings.h
ystem_clock_observer.cc
ystem_clock_observer.h
ray_caps_lock.cc
ray_caps_lock.h
ray_display.cc
ray_display.h
ray_display_unittest.cc
ray_tracing.cc
ray_tracing.h
irtual_keyboard/virtual_keyboard_tray.cc
irtual_keyboard/virtual_keyboard_tray.h
effb81e5f8246d0db0270817048dc992db66e9fb 31-Mar-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
etwork/network_connect.cc
etwork/network_connect.h
etwork/network_state_notifier.cc
23730a6e56a168d1879203e4b3819bb36e3d8f1f 21-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: Id197cbdde2c2881915f096c0426c741416884783
rightness/tray_brightness.cc
rightness/tray_brightness.h
rightness/tray_brightness_unittest.cc
etwork/network_state_notifier.cc
a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 18-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
udio/audio_detailed_view.cc
udio/audio_detailed_view.h
udio/tray_audio.cc
udio/tray_audio.h
udio/tray_audio_chromeos.cc
udio/tray_audio_chromeos.h
udio/tray_audio_delegate_chromeos.cc
udio/tray_audio_delegate_chromeos.h
luetooth/bluetooth_notification_controller.cc
luetooth/bluetooth_notification_controller.h
rightness/tray_brightness.cc
etwork/network_connect.cc
etwork/network_icon.cc
etwork/network_portal_detector_observer.h
etwork/network_state_list_detailed_view.cc
etwork/network_state_list_detailed_view.h
etwork/network_state_notifier.cc
etwork/network_state_notifier.h
etwork/tray_network.cc
etwork/tray_network.h
etwork/tray_sms.cc
ower/power_event_observer.cc
ower/power_status.cc
ower/power_status_view.cc
ower/power_status_view.h
ower/power_status_view_unittest.cc
ower/tray_power.cc
ession/last_window_closed_logout_reminder.cc
ession/last_window_closed_logout_reminder.h
ession/last_window_closed_observer.h
ession/logout_button_observer.h
ession/logout_button_tray.cc
ession/logout_button_tray.h
ession/logout_confirmation_controller.cc
ession/logout_confirmation_controller.h
ession/logout_confirmation_controller_unittest.cc
ession/logout_confirmation_dialog.cc
ession/logout_confirmation_dialog.h
ession/session_length_limit_observer.h
ession/tray_session_length_limit.cc
ession/tray_session_length_limit.h
ession/tray_session_length_limit_unittest.cc
ettings/tray_settings.cc
ray_caps_lock.cc
ray_caps_lock.h
ray_display.cc
ray_display.h
ray_display_unittest.cc
irtual_keyboard/virtual_keyboard_tray.cc
irtual_keyboard/virtual_keyboard_tray.h
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 21-Feb-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
udio/tray_audio.cc
udio/tray_audio.h
rightness/brightness_controller_chromeos.cc
rightness/tray_brightness.cc
rightness/tray_brightness.h
eyboard_brightness_controller.cc
abel_tray_view.cc
anaged/tray_locally_managed_user.cc
etwork/network_connect.cc
etwork/network_icon.cc
etwork/network_state_list_detailed_view.cc
etwork/network_state_notifier.cc
etwork/tray_network.cc
etwork/tray_sms.cc
etwork/tray_vpn.cc
ower/power_status.cc
ower/power_status.h
ower/power_status_view.cc
ower/tray_power.cc
ower/tray_power.h
ower/tray_power_unittest.cc
ower/user_activity_notifier.cc
ower/video_activity_notifier.cc
ower/video_activity_notifier.h
creen_security/screen_capture_tray_item.cc
creen_security/screen_share_tray_item.cc
creen_security/screen_tray_item.cc
creen_security/screen_tray_item.h
creen_security/screen_tray_item_unittest.cc
ettings/tray_settings.cc
ray_display.cc
ray_display_unittest.cc
a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 18-Dec-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
udio/tray_audio.cc
abel_tray_view.cc
anaged/tray_locally_managed_user.cc
etwork/network_connect.cc
etwork/network_state_list_detailed_view.cc
etwork/network_state_notifier.cc
etwork/tray_sms.cc
ower/tray_power.cc
creen_security/screen_capture_tray_item.cc
creen_security/screen_share_tray_item.cc
ray_display.cc
f2477e01787aa58f445919b809d89e252beef54f 28-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
etwork/network_connect.cc
etwork/network_state_notifier_unittest.cc
ower/tray_power.cc
ray_display.cc
1e9bf3e0803691d0a228da41fc608347b6db4340 31-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
nterprise/tray_enterprise.cc
anaged/tray_locally_managed_user.cc
ower/power_event_observer.cc
ower/power_event_observer.h
ower/power_event_observer_unittest.cc
ower/power_status.cc
ower/power_status.h
ower/power_status_unittest.cc
ower/power_status_view.cc
ower/tray_power.cc
ower/tray_power.h
ower/tray_power_unittest.cc
creen_security/screen_tray_item_unittest.cc
ystem_clock_observer.cc
ray_display.cc
ray_display_unittest.cc
ray_tracing.cc
8bcbed890bc3ce4d7a057a8f32cab53fa534672e 22-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 230120

This commit was generated by merge_to_master.py.

Change-Id: I54bc06b7ee8a07092e74ce3b68c6893508349042
etwork/network_state_list_detailed_view.cc
ower/power_status_view.cc
ower/tray_power.cc
ray_display.cc
4e180b6a0b4720a9b8e9e959a882386f690f08ff 18-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
rightness/brightness_controller_chromeos.cc
rightness/brightness_controller_chromeos.h
rightness/tray_brightness.cc
rightness/tray_brightness.h
etwork/network_connect.cc
etwork/network_connect.h
etwork/network_state_list_detailed_view.cc
etwork/network_state_list_detailed_view.h
etwork/network_state_notifier.cc
etwork/network_state_notifier_unittest.cc
ower/power_event_observer.cc
ower/power_event_observer.h
ower/user_activity_notifier.cc
ower/user_activity_notifier.h
ower/video_activity_notifier.cc
ower/video_activity_notifier.h
ystem_clock_observer.cc
ystem_clock_observer.h
68043e1e95eeb07d5cae7aca370b26518b0867d6 26-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
etwork/network_connect.cc
etwork/network_icon.cc
etwork/network_state_list_detailed_view.cc
etwork/network_state_notifier.cc
etwork/network_state_notifier_unittest.cc
etwork/tray_network.cc
etwork/tray_vpn.cc
ray_display_unittest.cc
d0247b1b59f9c528cb6df88b4f2b9afaf80d181e 19-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 224184

This commit was generated by merge_to_master.py.

Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
anaged/tray_locally_managed_user.cc
anaged/tray_locally_managed_user_unittest.cc
etwork/network_connect.cc
etwork/network_icon_animation.cc
etwork/network_icon_animation.h
etwork/network_state_notifier.cc
etwork/network_state_notifier.h
etwork/tray_network_state_observer.cc
etwork/tray_network_state_observer.h
creen_security/screen_tray_item_unittest.cc
ray_display.cc
ray_display.h
ray_display_unittest.cc
58537e28ecd584eab876aee8be7156509866d23a 12-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 222756

This commit was generated by merge_to_master.py.

Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
udio/tray_audio.cc
anaged/tray_locally_managed_user.cc
etwork/network_connect.cc
etwork/network_connect.h
etwork/network_icon.cc
etwork/network_state_list_detailed_view.cc
etwork/network_state_list_detailed_view.h
etwork/network_state_notifier.cc
etwork/tray_network.cc
etwork/tray_vpn.cc
ower/tray_power.cc
creen_security/screen_capture_tray_item.cc
creen_security/screen_share_tray_item.cc
ray_display.cc
424c4d7b64af9d0d8fd9624f381f469654d5e3d2 30-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r220549

This commit was generated by merge_to_master.py.

Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
anaged/tray_locally_managed_user.cc
etwork/network_connect.cc
etwork/network_icon_animation.cc
etwork/network_state_notifier.cc
etwork/tray_vpn.cc
etwork/tray_vpn.h
ower/tray_power.cc
creen_security/screen_capture_tray_item.cc
creen_security/screen_share_tray_item.cc
ray_display.cc
ray_display.h
3551c9c881056c480085172ff9840cab31610854 23-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
udio/tray_audio.cc
anaged/tray_locally_managed_user.cc
anaged/tray_locally_managed_user.h
anaged/tray_locally_managed_user_unittest.cc
etwork/network_connect.cc
etwork/network_connect.h
etwork/network_observer.cc
etwork/network_observer.h
etwork/network_state_list_detailed_view.cc
etwork/network_state_notifier.cc
etwork/network_state_notifier.h
etwork/network_state_notifier_unittest.cc
etwork/network_tray_delegate.h
etwork/sms_observer.h
etwork/tray_network.cc
etwork/tray_network.h
etwork/tray_sms.cc
etwork/tray_sms.h
ettings/tray_settings.cc
ray_display.cc
ray_display.h
ray_display_unittest.cc
ray_tracing.cc
c2db58bd994c04d98e4ee2cd7565b71548655fe3 14-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r217147

This commit was generated by merge_to_master.py.

Change-Id: Ifa927da4997e49ab95edfc5def5ee5615a76b1be
etwork/tray_network.cc
ray_display.cc
ray_display.h
ray_display_unittest.cc
ba5b9a6411cb1792fd21f0a078d7a25cd1ceec16 12-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216972

This commit was generated by merge_to_master.py.

Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd
anaged/tray_locally_managed_user.cc
anaged/tray_locally_managed_user.h
etwork/network_connect.cc
etwork/network_connect.h
etwork/network_icon.cc
etwork/network_state_list_detailed_view.cc
etwork/network_state_notifier.cc
etwork/network_state_notifier.h
etwork/network_state_notifier_unittest.cc
ray_display.cc
ray_display_unittest.cc
ray_tracing.cc
ray_tracing.h
bb1529ce867d8845a77ec7cdf3e3003ef1771a40 08-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216370

This commit was generated by merge_to_master.py.

Change-Id: I739228187a6f1df6c28c5761160e593a49891113
udio/tray_audio.cc
ower/power_status.cc
ower/power_status_view.cc
creen_security/screen_capture_tray_item.cc
creen_security/screen_capture_tray_item.h
creen_security/screen_share_tray_item.cc
creen_security/screen_share_tray_item.h
creen_security/screen_tray_item.cc
creen_security/screen_tray_item.h
creen_security/screen_tray_item_unittest.cc
a36e5920737c6adbddd3e43b760e5de8431db6e0 05-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r215573

This commit was generated by merge_to_master.py.

Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
udio/audio_observer.h
udio/tray_audio.cc
udio/tray_audio.h
etwork/network_connect.cc
etwork/network_icon.cc
etwork/network_observer.cc
ray_display.cc
d3868032626d59662ff73b372b5d584c1d144c53 31-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214391

This commit was generated by merge_to_master.py.

Change-Id: Iad15fada300ebc6cf9cbcebfc484b1a5f5f372e5
ray_display.cc
ray_display_unittest.cc
558790d6acca3451cf3a6b497803a5f07d0bec58 30-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214332

This commit was generated by merge_to_master.py.

Change-Id: I82a7c38de906244dc882493568013be659aa65d1
etwork/network_state_list_detailed_view.cc
ca12bfac764ba476d6cd062bf1dde12cc64c3f40 23-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213057

This commit was generated by merge_to_master.py.

Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388
udio/tray_audio.cc
ower/tray_power.cc
ray_display.cc
ray_display.h
ray_display_unittest.cc
7dbb3d5cf0c15f500944d211057644d6a2f37371 17-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212014

This commit was generated by merge_to_master.py.

Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
udio/tray_audio.cc
etwork/network_connect.cc
etwork/network_connect.h
etwork/network_state_list_detailed_view.cc
etwork/network_state_list_detailed_view.h
etwork/network_state_notifier.cc
ower/power_status.cc
ower/power_status.h
ower/power_status_unittest.cc
ower/power_status_view.cc
ray_display.cc
eb525c5499e34cc9c4b825d6d9e75bb07cc06ace 10-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r210036

This commit was generated by merge_to_master.py.

Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
udio/tray_audio.cc
abel_tray_view.cc
anaged/tray_locally_managed_user.cc
anaged/tray_locally_managed_user.h
etwork/network_state_list_detailed_view.cc
etwork/network_state_notifier.h
etwork/network_state_notifier_unittest.cc
etwork/tray_network.h
ower/power_status.cc
ower/power_status.h
ower/power_status_unittest.cc
ower/power_status_view.cc
ower/power_status_view.h
ower/tray_power.cc
ower/tray_power.h
ower/tray_power_unittest.cc
creen_security/screen_capture_tray_item.h
creen_security/screen_share_tray_item.cc
creen_security/screen_share_tray_item.h
creen_security/screen_tray_item.h
creen_security/screen_tray_item_unittest.cc
ettings/tray_settings.cc
ettings/tray_settings.h
ray_display.cc
ray_display.h
ray_display_unittest.cc
7d4cd473f85ac64c3747c96c277f9e506a0d2246 19-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r207203

This commit was generated by merge_to_master.py.

Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
abel_tray_view.cc
anaged/tray_locally_managed_user.cc
etwork/network_connect.cc
etwork/network_detailed_view.h
etwork/network_icon.cc
etwork/network_icon.h
etwork/network_state_list_detailed_view.cc
etwork/network_state_list_detailed_view.h
etwork/network_state_notifier.cc
etwork/tray_network_state_observer.cc
ower/tray_power.cc
ray_display.cc
868fa2fe829687343ffae624259930155e16dbd8 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
udio/tray_audio.cc
abel_tray_view.h
anaged/tray_locally_managed_user.cc
etwork/network_connect.cc
etwork/network_connect.h
etwork/network_icon.cc
etwork/network_icon.h
etwork/network_observer.cc
etwork/network_observer.h
etwork/network_state_list_detailed_view.cc
etwork/network_state_list_detailed_view.h
etwork/network_state_notifier.cc
etwork/network_state_notifier.h
etwork/network_state_notifier_unittest.cc
etwork/tray_network.cc
etwork/tray_network.h
etwork/tray_sms.cc
ower/power_status_view.cc
ower/tray_power.cc
creen_capture/screen_capture_observer.h
creen_capture/tray_screen_capture.cc
creen_capture/tray_screen_capture.h
creen_security/screen_capture_observer.h
creen_security/screen_capture_tray_item.cc
creen_security/screen_capture_tray_item.h
creen_security/screen_share_observer.h
creen_security/screen_share_tray_item.cc
creen_security/screen_share_tray_item.h
creen_security/screen_tray_item.cc
creen_security/screen_tray_item.h
ettings/tray_settings.cc
ray_display.cc
ray_display.h
90dce4d38c5ff5333bea97d859d4e484e27edf0c 29-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r202854

This commit was generated by merge_to_master.py.

Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
udio/tray_audio.cc
anaged/tray_locally_managed_user.cc
anaged/tray_locally_managed_user.h
etwork/network_detailed_view.h
etwork/network_icon.cc
etwork/network_list_detailed_view.cc
etwork/network_list_detailed_view.h
etwork/network_list_detailed_view_base.cc
etwork/network_list_detailed_view_base.h
etwork/network_observer.h
etwork/network_state_list_detailed_view.cc
etwork/network_state_notifier.cc
etwork/network_state_notifier_unittest.cc
etwork/tray_network.cc
etwork/tray_network.h
etwork/tray_network_state_observer.cc
etwork/tray_sms.cc
etwork/tray_vpn.cc
etwork/tray_vpn.h
ower/power_status_view.cc
ower/power_status_view.h
ower/tray_power.cc
ower/tray_power.h
ettings/tray_settings.cc
ettings/tray_settings.h
ray_display.cc
a93a17c8d99d686bd4a1511e5504e5e6cc9fcadf 15-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r200144

This commit was generated by merge_to_master.py.

Change-Id: I85f3a249ae157fd8253431215fb2dfcd12ee9bf3
udio/tray_audio.cc
etwork/network_state_list_detailed_view.cc
etwork/network_state_list_detailed_view.h
ray_display.cc
b2df76ea8fec9e32f6f3718986dba0d95315b29c 13-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r199464

This commit was generated by merge_to_master.py.

Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
udio/tray_audio.cc
udio/tray_audio.h
etwork/tray_network.cc
c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d 09-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f
udio/audio_observer.h
udio/tray_audio.cc
udio/tray_audio.h
nterprise/tray_enterprise.cc
nterprise/tray_enterprise.h
abel_tray_view.cc
abel_tray_view.h
anaged/tray_locally_managed_user.cc
anaged/tray_locally_managed_user.h
etwork/network_icon.cc
etwork/network_icon.h
etwork/network_icon_animation.cc
etwork/network_icon_animation.h
etwork/network_list_detailed_view.cc
etwork/network_list_detailed_view_base.cc
etwork/network_list_detailed_view_base.h
etwork/network_observer.h
etwork/network_state_list_detailed_view.cc
etwork/network_state_list_detailed_view.h
etwork/network_state_notifier.cc
etwork/network_state_notifier.h
etwork/network_state_notifier_unittest.cc
etwork/tray_network.cc
etwork/tray_network.h
etwork/tray_network_state_observer.cc
etwork/tray_sms.cc
etwork/tray_vpn.cc
etwork/tray_vpn.h
creen_capture/screen_capture_observer.h
creen_capture/tray_screen_capture.cc
creen_capture/tray_screen_capture.h
ray_display.cc
2a99a7e74a7f215066514fe81d2bfa6639d9eddd 28-Mar-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
nterprise/enterprise_domain_observer.h
nterprise/tray_enterprise.cc
nterprise/tray_enterprise.h
eyboard_brightness_controller.cc
etwork/network_detailed_view.h
etwork/network_icon.cc
etwork/network_icon.h
etwork/network_icon_animation.cc
etwork/network_icon_animation.h
etwork/network_icon_animation_observer.h
etwork/network_list_detailed_view.cc
etwork/network_list_detailed_view.h
etwork/network_list_detailed_view_base.cc
etwork/network_list_detailed_view_base.h
etwork/network_observer.h
etwork/network_state_list_detailed_view.cc
etwork/network_state_list_detailed_view.h
etwork/network_state_notifier.cc
etwork/network_state_notifier.h
etwork/network_state_notifier_unittest.cc
etwork/network_tray_delegate.h
etwork/tray_network.cc
etwork/tray_network.h
etwork/tray_network_state_observer.cc
etwork/tray_network_state_observer.h
etwork/tray_sms.cc
etwork/tray_sms.h
etwork/tray_vpn.cc
etwork/tray_vpn.h
creen_capture/screen_capture_observer.h
creen_capture/tray_screen_capture.cc
creen_capture/tray_screen_capture.h
ray_display.cc
ray_display.h
5821806d5e7f356e8fa4b058a389a808ea183019 14-Nov-2012 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
EPS
eyboard_brightness_controller.cc
eyboard_brightness_controller.h
etwork/network_detailed_view.h
etwork/network_list_detailed_view_base.cc
etwork/network_list_detailed_view_base.h
etwork/network_observer.h
etwork/sms_observer.h
etwork/tray_network.cc
etwork/tray_network.h
etwork/tray_sms.cc
etwork/tray_sms.h
etwork/tray_vpn.cc
etwork/tray_vpn.h
ray_display.cc
ray_display.h