mash: Migrate remaining tray observers and notify functions.

ash/ash.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
     # These files lists are shared with the GN build.
     'ash_sources': [
       'accelerators/accelerator_commands.cc',
@@ skipping 91 matching lines @@
       'common/shelf/wm_shelf_util.h',
       'common/shell_window_ids.cc',
       'common/shell_window_ids.h',
       'common/system/accessibility_observer.h',
       'common/system/audio/audio_observer.h',
       'common/system/audio/tray_audio.cc',
       'common/system/audio/tray_audio.h',
       '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',
       'common/system/chromeos/power/dual_role_notification.h',
       'common/system/chromeos/power/power_status.cc',
       'common/system/chromeos/power/power_status.h',
       'common/system/chromeos/power/power_status_view.cc',
       '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',
       'common/system/chromeos/system_clock_observer.cc',
       'common/system/chromeos/system_clock_observer.h',
       'common/system/chromeos/tray_tracing.cc',
       'common/system/chromeos/tray_tracing.h',
       'common/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h',
       'common/system/date/clock_observer.h',
       'common/system/date/date_default_view.cc',
@@ skipping 23 matching lines @@
       'common/system/tray/hover_highlight_view.cc',
       'common/system/tray/hover_highlight_view.h',
       'common/system/tray/special_popup_row.cc',
       'common/system/tray/special_popup_row.h',
       'common/system/tray/system_tray_bubble.cc',
       'common/system/tray/system_tray_bubble.h',
       'common/system/tray/system_tray_delegate.cc',
       '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',
       'common/system/tray/tray_background_view.h',
       'common/system/tray/tray_bar_button_with_title.cc',
       'common/system/tray/tray_bar_button_with_title.h',
       'common/system/tray/tray_bubble_wrapper.cc',
       'common/system/tray/tray_bubble_wrapper.h',
       'common/system/tray/tray_constants.cc',
       'common/system/tray/tray_constants.h',
@@ skipping 15 matching lines @@
       'common/system/tray/tray_popup_header_button.h',
       'common/system/tray/tray_popup_item_container.cc',
       'common/system/tray/tray_popup_item_container.h',
       'common/system/tray/tray_popup_label_button.cc',
       'common/system/tray/tray_popup_label_button.h',
       'common/system/tray/tray_popup_label_button_border.cc',
       'common/system/tray/tray_popup_label_button_border.h',
       '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',
       'common/system/update/tray_update.h',
       'common/system/update/update_observer.h',
       'common/system/user/button_from_view.cc',
       'common/system/user/button_from_view.h',
       'common/system/user/login_status.cc',
       'common/system/user/login_status.h',
       'common/system/user/rounded_image_view.cc',
@@ skipping 317 matching lines @@
       'system/cast/tray_cast.cc',
       'system/cast/tray_cast.h',
       'system/chromeos/audio/audio_detailed_view.cc',
       'system/chromeos/audio/audio_detailed_view.h',
       'system/chromeos/audio/tray_audio_chromeos.cc',
       'system/chromeos/audio/tray_audio_chromeos.h',
       'system/chromeos/audio/tray_audio_delegate_chromeos.cc',
       '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',
       'system/chromeos/network/tray_network.h',
       'system/chromeos/network/tray_network_state_observer.cc',
       'system/chromeos/network/tray_network_state_observer.h',
       'system/chromeos/network/tray_sms.cc',
       'system/chromeos/network/tray_sms.h',
       'system/chromeos/network/tray_vpn.cc',
       'system/chromeos/network/tray_vpn.h',
       'system/chromeos/network/vpn_delegate.cc',
       'system/chromeos/network/vpn_delegate.h',
       'system/chromeos/network/vpn_list_view.cc',
       'system/chromeos/network/vpn_list_view.h',
       'system/chromeos/power/power_event_observer.cc',
       'system/chromeos/power/power_event_observer.h',
       'system/chromeos/power/video_activity_notifier.cc',
       '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',
       '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/chromeos/virtual_keyboard/virtual_keyboard_tray.cc',
       'system/chromeos/virtual_keyboard/virtual_keyboard_tray.h',
       'system/keyboard_brightness/keyboard_brightness_control_delegate.h',
       'system/overview/overview_button_tray.cc',
       'system/overview/overview_button_tray.h',
       'system/status_area_widget.cc',
       'system/status_area_widget.h',
       'system/status_area_widget_delegate.cc',
       'system/status_area_widget_delegate.h',
       'system/toast/toast_data.cc',
       'system/toast/toast_data.h',
       'system/toast/toast_manager.cc',
       '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',
       'system/user/user_card_view.h',
       'system/user/user_view.cc',
       'system/user/user_view.h',
       'system/web_notification/ash_popup_alignment_delegate.cc',
       'system/web_notification/ash_popup_alignment_delegate.h',
       'system/web_notification/web_notification_tray.cc',
       'system/web_notification/web_notification_tray.h',
@@ skipping 314 matching lines @@
       'shelf/shelf_navigator_unittest.cc',
       'shelf/shelf_tooltip_manager_unittest.cc',
       'shelf/shelf_unittest.cc',
       'shelf/shelf_view_unittest.cc',
       'shelf/shelf_widget_unittest.cc',
       'shelf/shelf_window_watcher_unittest.cc',
       'shell_unittest.cc',
       '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',
       'system/chromeos/screen_security/screen_tray_item_unittest.cc',
       'system/chromeos/session/logout_confirmation_controller_unittest.cc',
       'system/chromeos/session/tray_session_length_limit_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',
-      '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',
       'system/web_notification/web_notification_tray_unittest.cc',
       'test/ash_test_helper_unittest.cc',
       'test/ash_unittests.cc',
       'tooltips/tooltip_controller_unittest.cc',
       'touch/touch_observer_hud_unittest.cc',
       'touch/touch_transformer_controller_unittest.cc',
       'touch/touchscreen_util_unittest.cc',
@@ skipping 143 matching lines @@
         }, { # else: chromeos!=1
           'sources!': [
             'accelerators/key_hold_detector.cc',
             'accelerators/key_hold_detector.h',
             'accelerators/magnifier_key_scroller.cc',
             'accelerators/magnifier_key_scroller.h',
             'accelerators/spoken_feedback_toggler.cc',
             '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',
             'touch/touchscreen_util.h',
             'virtual_keyboard_controller.cc',
             'virtual_keyboard_controller.h'
           ],
         }],
       ],
     },
@@ skipping 151 matching lines @@
 
             # All tests for multiple displays: not supported on Windows Ash.
             'wm/drag_window_resizer_unittest.cc',
 
             # Can't resize on Windows Ash. http://crbug.com/165962
             'autoclick/autoclick_unittest.cc',
             'magnifier/magnification_controller_unittest.cc',
             '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',
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         }],
@@ skipping 132 matching lines @@
                   '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
                 ],
               }
             ],
           ],
         },
       ],
     }],
   ],
 }