Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1976)

Unified Diff: ash/ash.gyp

Issue 2108403004: mash: Move several chromeos system tray items to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@audio
Patch Set: Rebase Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/common/system/chromeos/bluetooth/bluetooth_notification_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 5352eedc8068f44b023d16dda9ce3c55c4ed625a..32040c240e5bc4fbf845ef5d1a7dc3101a5e3df3 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -117,10 +117,16 @@
'common/system/chromeos/audio/tray_audio_chromeos.h',
'common/system/chromeos/audio/tray_audio_delegate_chromeos.cc',
'common/system/chromeos/audio/tray_audio_delegate_chromeos.h',
+ 'common/system/chromeos/bluetooth/bluetooth_notification_controller.cc',
+ 'common/system/chromeos/bluetooth/bluetooth_notification_controller.h',
'common/system/chromeos/bluetooth/bluetooth_observer.h',
+ 'common/system/chromeos/bluetooth/tray_bluetooth.cc',
+ 'common/system/chromeos/bluetooth/tray_bluetooth.h',
'common/system/chromeos/devicetype_utils.cc',
'common/system/chromeos/devicetype_utils.h',
'common/system/chromeos/enterprise/enterprise_domain_observer.h',
+ 'common/system/chromeos/enterprise/tray_enterprise.cc',
+ 'common/system/chromeos/enterprise/tray_enterprise.h',
'common/system/chromeos/media_security/media_capture_observer.h',
'common/system/chromeos/network/network_detailed_view.h',
'common/system/chromeos/network/network_observer.h',
@@ -171,8 +177,13 @@
'common/system/chromeos/settings/tray_settings.cc',
'common/system/chromeos/settings/tray_settings.h',
'common/system/chromeos/shutdown_policy_observer.h',
+ 'common/system/chromeos/supervised/custodian_info_tray_observer.h',
+ 'common/system/chromeos/supervised/tray_supervised_user.cc',
+ 'common/system/chromeos/supervised/tray_supervised_user.h',
'common/system/chromeos/system_clock_observer.cc',
'common/system/chromeos/system_clock_observer.h',
+ 'common/system/chromeos/tray_caps_lock.cc',
+ 'common/system/chromeos/tray_caps_lock.h',
'common/system/chromeos/tray_tracing.cc',
'common/system/chromeos/tray_tracing.h',
'common/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h',
@@ -591,16 +602,10 @@
'sticky_keys/sticky_keys_overlay.h',
'sticky_keys/sticky_keys_state.h',
'system/brightness_control_delegate.h',
- 'system/chromeos/bluetooth/bluetooth_notification_controller.cc',
- 'system/chromeos/bluetooth/bluetooth_notification_controller.h',
- 'system/chromeos/bluetooth/tray_bluetooth.cc',
- 'system/chromeos/bluetooth/tray_bluetooth.h',
'system/chromeos/brightness/brightness_controller_chromeos.cc',
'system/chromeos/brightness/brightness_controller_chromeos.h',
'system/chromeos/brightness/tray_brightness.cc',
'system/chromeos/brightness/tray_brightness.h',
- 'system/chromeos/enterprise/tray_enterprise.cc',
- 'system/chromeos/enterprise/tray_enterprise.h',
'system/chromeos/keyboard_brightness_controller.cc',
'system/chromeos/keyboard_brightness_controller.h',
'system/chromeos/media_security/multi_profile_media_tray_item.cc',
@@ -613,11 +618,6 @@
'system/chromeos/power/video_activity_notifier.h',
'system/chromeos/rotation/tray_rotation_lock.cc',
'system/chromeos/rotation/tray_rotation_lock.h',
- 'system/chromeos/supervised/custodian_info_tray_observer.h',
- 'system/chromeos/supervised/tray_supervised_user.cc',
- 'system/chromeos/supervised/tray_supervised_user.h',
- 'system/chromeos/tray_caps_lock.cc',
- 'system/chromeos/tray_caps_lock.h',
'system/chromeos/tray_display.cc',
'system/chromeos/tray_display.h',
'system/keyboard_brightness/keyboard_brightness_control_delegate.h',
@@ -904,6 +904,7 @@
'common/system/chromeos/screen_security/screen_tray_item_unittest.cc',
'common/system/chromeos/session/logout_confirmation_controller_unittest.cc',
'common/system/chromeos/session/tray_session_length_limit_unittest.cc',
+ 'common/system/chromeos/supervised/tray_supervised_user_unittest.cc',
'common/system/date/date_view_unittest.cc',
'common/system/ime/tray_ime_chromeos_unittest.cc',
'common/system/tray/tray_details_view_unittest.cc',
@@ -966,7 +967,6 @@
'system/chromeos/multi_user/user_switch_util_unittest.cc',
'system/chromeos/power/power_event_observer_unittest.cc',
'system/chromeos/rotation/tray_rotation_lock_unittest.cc',
- 'system/chromeos/supervised/tray_supervised_user_unittest.cc',
'system/chromeos/tray_display_unittest.cc',
'system/overview/overview_button_tray_unittest.cc',
'system/toast/toast_manager_unittest.cc',
« no previous file with comments | « no previous file | ash/common/system/chromeos/bluetooth/bluetooth_notification_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698