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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/ash.gyp

Issue 2098023002: mash: Migrate remaining tray observers and notify functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and 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 | « ash/accelerators/accelerator_interactive_uitest_chromeos.cc ('k') | ash/ash_touch_exploration_manager_chromeos.cc » ('j') | ash/shell.h » ('J')
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 8e02a40acc9585ebc75fcbfb968218c277f5286f..41c105946655fe6bbeada4be29af65a5c7ae7d69 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -109,8 +109,13 @@
'common/system/audio/tray_audio_delegate.h',
'common/system/audio/volume_view.cc',
'common/system/audio/volume_view.h',
+ 'common/system/chromeos/bluetooth/bluetooth_observer.h',
'common/system/chromeos/devicetype_utils.cc',
'common/system/chromeos/devicetype_utils.h',
+ 'common/system/chromeos/enterprise/enterprise_domain_observer.h',
+ 'common/system/chromeos/media_security/media_capture_observer.h',
+ 'common/system/chromeos/network/network_observer.h',
+ 'common/system/chromeos/network/network_portal_detector_observer.h',
'common/system/chromeos/power/battery_notification.cc',
'common/system/chromeos/power/battery_notification.h',
'common/system/chromeos/power/dual_role_notification.cc',
@@ -121,6 +126,11 @@
'common/system/chromeos/power/power_status_view.h',
'common/system/chromeos/power/tray_power.cc',
'common/system/chromeos/power/tray_power.h',
+ 'common/system/chromeos/screen_security/screen_capture_observer.h',
+ 'common/system/chromeos/screen_security/screen_share_observer.h',
+ 'common/system/chromeos/session/last_window_closed_observer.h',
+ 'common/system/chromeos/session/logout_button_observer.h',
+ 'common/system/chromeos/session/session_length_limit_observer.h',
'common/system/chromeos/settings/tray_settings.cc',
'common/system/chromeos/settings/tray_settings.h',
'common/system/chromeos/shutdown_policy_observer.h',
@@ -164,6 +174,8 @@
'common/system/tray/system_tray_delegate.h',
'common/system/tray/system_tray_item.cc',
'common/system/tray/system_tray_item.h',
+ 'common/system/tray/system_tray_notifier.cc',
+ 'common/system/tray/system_tray_notifier.h',
'common/system/tray/throbber_view.cc',
'common/system/tray/throbber_view.h',
'common/system/tray/tray_background_view.cc',
@@ -199,8 +211,6 @@
'common/system/tray/tray_utils.cc',
'common/system/tray/tray_utils.h',
'common/system/tray/view_click_listener.h',
- 'common/system/tray/wm_system_tray_notifier.cc',
- 'common/system/tray/wm_system_tray_notifier.h',
'common/system/tray_accessibility.cc',
'common/system/tray_accessibility.h',
'common/system/update/tray_update.cc',
@@ -538,25 +548,23 @@
'system/chromeos/audio/tray_audio_delegate_chromeos.h',
'system/chromeos/bluetooth/bluetooth_notification_controller.cc',
'system/chromeos/bluetooth/bluetooth_notification_controller.h',
- 'system/chromeos/bluetooth/bluetooth_observer.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/enterprise_domain_observer.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/label_tray_view.cc',
'system/chromeos/label_tray_view.h',
+ 'system/chromeos/media_security/multi_profile_media_tray_item.cc',
+ 'system/chromeos/media_security/multi_profile_media_tray_item.h',
'system/chromeos/multi_user/user_switch_util.cc',
'system/chromeos/multi_user/user_switch_util.h',
'system/chromeos/network/network_detailed_view.h',
- 'system/chromeos/network/network_observer.h',
- 'system/chromeos/network/network_portal_detector_observer.h',
'system/chromeos/network/network_state_list_detailed_view.cc',
'system/chromeos/network/network_state_list_detailed_view.h',
'system/chromeos/network/tray_network.cc',
@@ -577,25 +585,20 @@
'system/chromeos/power/video_activity_notifier.h',
'system/chromeos/rotation/tray_rotation_lock.cc',
'system/chromeos/rotation/tray_rotation_lock.h',
- 'system/chromeos/screen_security/screen_capture_observer.h',
'system/chromeos/screen_security/screen_capture_tray_item.cc',
'system/chromeos/screen_security/screen_capture_tray_item.h',
- 'system/chromeos/screen_security/screen_share_observer.h',
'system/chromeos/screen_security/screen_share_tray_item.cc',
'system/chromeos/screen_security/screen_share_tray_item.h',
'system/chromeos/screen_security/screen_tray_item.cc',
'system/chromeos/screen_security/screen_tray_item.h',
'system/chromeos/session/last_window_closed_logout_reminder.cc',
'system/chromeos/session/last_window_closed_logout_reminder.h',
- 'system/chromeos/session/last_window_closed_observer.h',
- 'system/chromeos/session/logout_button_observer.h',
'system/chromeos/session/logout_button_tray.cc',
'system/chromeos/session/logout_button_tray.h',
'system/chromeos/session/logout_confirmation_controller.cc',
'system/chromeos/session/logout_confirmation_controller.h',
'system/chromeos/session/logout_confirmation_dialog.cc',
'system/chromeos/session/logout_confirmation_dialog.h',
- 'system/chromeos/session/session_length_limit_observer.h',
'system/chromeos/session/tray_session_length_limit.cc',
'system/chromeos/session/tray_session_length_limit.h',
'system/chromeos/supervised/custodian_info_tray_observer.h',
@@ -620,13 +623,8 @@
'system/toast/toast_manager.h',
'system/toast/toast_overlay.cc',
'system/toast/toast_overlay.h',
- 'system/tray/media_security/media_capture_observer.h',
- 'system/tray/media_security/multi_profile_media_tray_item.cc',
- 'system/tray/media_security/multi_profile_media_tray_item.h',
'system/tray/system_tray.cc',
'system/tray/system_tray.h',
- 'system/tray/system_tray_notifier.cc',
- 'system/tray/system_tray_notifier.h',
'system/user/tray_user.cc',
'system/user/tray_user.h',
'system/user/user_card_view.cc',
@@ -961,6 +959,7 @@
'sticky_keys/sticky_keys_overlay_unittest.cc',
'sticky_keys/sticky_keys_unittest.cc',
'system/chromeos/brightness/tray_brightness_unittest.cc',
+ 'system/chromeos/media_security/multi_profile_media_tray_item_unittest.cc',
'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',
@@ -971,7 +970,6 @@
'system/chromeos/tray_display_unittest.cc',
'system/overview/overview_button_tray_unittest.cc',
'system/toast/toast_manager_unittest.cc',
- 'system/tray/media_security/multi_profile_media_tray_item_unittest.cc',
'system/tray/system_tray_unittest.cc',
'system/user/tray_user_unittest.cc',
'system/web_notification/ash_popup_alignment_delegate_unittest.cc',
@@ -1135,9 +1133,6 @@
'accelerators/spoken_feedback_toggler.h',
'display/resolution_notification_controller.cc',
'display/resolution_notification_controller.h',
- 'system/tray/media_security/media_capture_observer.h',
- 'system/tray/media_security/multi_profile_media_tray_item.cc',
- 'system/tray/media_security/multi_profile_media_tray_item.h',
'touch/touch_transformer_controller.cc',
'touch/touch_transformer_controller.h',
'touch/touchscreen_util.cc',
@@ -1309,7 +1304,6 @@
'sticky_keys/sticky_keys_overlay_unittest.cc',
'sticky_keys/sticky_keys_unittest.cc',
'system/chromeos/rotation/tray_rotation_lock_unittest.cc',
- 'system/tray/media_security/multi_profile_media_tray_item_unittest.cc',
'virtual_keyboard_controller_unittest.cc',
'wm/maximize_mode/maximize_mode_controller_unittest.cc',
'wm/workspace/workspace_window_resizer_unittest.cc',
« no previous file with comments | « ash/accelerators/accelerator_interactive_uitest_chromeos.cc ('k') | ash/ash_touch_exploration_manager_chromeos.cc » ('j') | ash/shell.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698