mash: Move tray settings and deps to common.

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 76 matching lines @@
       'common/shelf/shelf_model.cc',
       'common/shelf/shelf_model.h',
       'common/shelf/shelf_model_observer.h',
       'common/shelf/shelf_types.h',
       'common/shelf/wm_shelf.h',
       'common/shelf/wm_shelf_observer.h',
       'common/shelf/wm_shelf_util.cc',
       'common/shelf/wm_shelf_util.h',
       'common/shell_window_ids.cc',
       'common/shell_window_ids.h',
+      'common/system/chromeos/devicetype_utils.cc',
+      'common/system/chromeos/devicetype_utils.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/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/date/clock_observer.h',
       'common/system/date/date_default_view.cc',
       'common/system/date/date_default_view.h',
       'common/system/date/date_view.cc',
       'common/system/date/date_view.h',
       'common/system/date/tray_date.cc',
       'common/system/date/tray_date.h',
       'common/system/networking_config_delegate.cc',
       'common/system/networking_config_delegate.h',
+      'common/system/system_notifier.cc',
+      'common/system/system_notifier.h',
       'common/system/tray/actionable_view.cc',
       'common/system/tray/actionable_view.h',
       'common/system/tray/default_system_tray_delegate.cc',
       'common/system/tray/default_system_tray_delegate.h',
       'common/system/tray/fixed_sized_image_view.cc',
       'common/system/tray/fixed_sized_image_view.h',
       'common/system/tray/fixed_sized_scroll_view.cc',
       'common/system/tray/fixed_sized_scroll_view.h',
       'common/system/tray/hover_highlight_view.cc',
       'common/system/tray/hover_highlight_view.h',
@@ skipping 359 matching lines @@
       '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/devicetype_utils.cc',
-      'system/chromeos/devicetype_utils.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/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/battery_notification.cc',
-      'system/chromeos/power/battery_notification.h',
-      'system/chromeos/power/dual_role_notification.cc',
-      'system/chromeos/power/dual_role_notification.h',
       'system/chromeos/power/power_event_observer.cc',
       'system/chromeos/power/power_event_observer.h',
-      'system/chromeos/power/power_status.cc',
-      'system/chromeos/power/power_status.h',
-      'system/chromeos/power/power_status_view.cc',
-      'system/chromeos/power/power_status_view.h',
-      'system/chromeos/power/tray_power.cc',
-      'system/chromeos/power/tray_power.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/settings/tray_settings.cc',
-      'system/chromeos/settings/tray_settings.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/tray_tracing.cc',
       'system/chromeos/tray_tracing.h',
       'system/chromeos/virtual_keyboard/virtual_keyboard_observer.h',
       'system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc',
       'system/chromeos/virtual_keyboard/virtual_keyboard_tray.h',
       'system/ime/ime_observer.h',
       'system/ime/tray_ime_chromeos.cc',
       'system/ime/tray_ime_chromeos.h',
       'system/keyboard_brightness/keyboard_brightness_control_delegate.h',
       'system/locale/locale_notification_controller.cc',
       'system/locale/locale_notification_controller.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/system_notifier.cc',
-      'system/system_notifier.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',
@@ skipping 300 matching lines @@
       'accelerators/accelerator_controller_unittest.cc',
       'accelerators/accelerator_filter_unittest.cc',
       'accelerators/accelerator_table_unittest.cc',
       'accelerators/magnifier_key_scroller_unittest.cc',
       'accelerators/spoken_feedback_toggler_unittest.cc',
       'app_list/app_list_presenter_delegate_unittest.cc',
       'ash_touch_exploration_manager_chromeos_unittest.cc',
       'autoclick/autoclick_unittest.cc',
       'common/material_design/material_design_controller_unittest.cc',
       'common/shelf/shelf_model_unittest.cc',
+      'common/system/chromeos/power/power_status_unittest.cc',
+      'common/system/chromeos/power/power_status_view_unittest.cc',
+      'common/system/chromeos/power/tray_power_unittest.cc',
       'common/system/date/date_view_unittest.cc',
       'common/system/update/tray_update_unittest.cc',
       'content/display/screen_orientation_controller_chromeos_unittest.cc',
       'content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc',
       'content/keyboard_overlay/keyboard_overlay_view_unittest.cc',
       'desktop_background/desktop_background_controller_unittest.cc',
       'dip_unittest.cc',
       'display/cursor_window_controller_unittest.cc',
       'display/display_change_observer_chromeos_unittest.cc',
       'display/display_color_manager_chromeos_unittest.cc',
@@ skipping 39 matching lines @@
       '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/multi_user/user_switch_util_unittest.cc',
       'system/chromeos/power/power_event_observer_unittest.cc',
-      'system/chromeos/power/power_status_unittest.cc',
-      'system/chromeos/power/power_status_view_unittest.cc',
-      'system/chromeos/power/tray_power_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/ime/tray_ime_chromeos_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',
@@ skipping 479 matching lines @@
                   '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
                 ],
               }
             ],
           ],
         },
       ],
     }],
   ],
 }