mash: Migrate tray audio 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 46 matching lines @@
       'common/accessibility_delegate.h',
       'common/accessibility_types.h',
       'common/ash_constants.cc',
       'common/ash_constants.h',
       'common/ash_layout_constants.cc',
       'common/ash_layout_constants.h',
       'common/ash_switches.cc',
       'common/ash_switches.h',
       'common/default_accessibility_delegate.cc',
       'common/default_accessibility_delegate.h',
+      'common/display/display_info.cc',
+      'common/display/display_info.h',
       'common/focus_cycler.cc',
       'common/focus_cycler.h',
       'common/keyboard/keyboard_ui.cc',
       'common/keyboard/keyboard_ui.h',
       'common/keyboard/keyboard_ui_observer.h',
       'common/login_status.h',
       'common/material_design/material_design_controller.cc',
       'common/material_design/material_design_controller.h',
       'common/metrics/user_metrics_action.h',
       'common/root_window_controller_common.cc',
@@ skipping 17 matching lines @@
       '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/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/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',
@@ skipping 196 matching lines @@
       'display/display_animator_chromeos.cc',
       'display/display_animator_chromeos.h',
       'display/display_change_observer_chromeos.cc',
       'display/display_change_observer_chromeos.h',
       'display/display_color_manager_chromeos.cc',
       'display/display_color_manager_chromeos.h',
       'display/display_configuration_controller.cc',
       'display/display_configuration_controller.h',
       'display/display_error_observer_chromeos.cc',
       'display/display_error_observer_chromeos.h',
-      'display/display_info.cc',
-      'display/display_info.h',
       'display/display_layout_store.cc',
       'display/display_layout_store.h',
       'display/display_manager.cc',
       'display/display_manager.h',
       'display/display_pref_util.h',
       'display/display_util.cc',
       'display/display_util.h',
       'display/event_transformation_handler.cc',
       'display/event_transformation_handler.h',
       'display/extended_mouse_warp_controller.cc',
@@ skipping 163 matching lines @@
       'shell_factory.h',
       'shell_init_params.cc',
       'shell_init_params.h',
       'snap_to_pixel_layout_manager.cc',
       'snap_to_pixel_layout_manager.h',
       'sticky_keys/sticky_keys_controller.cc',
       'sticky_keys/sticky_keys_controller.h',
       'sticky_keys/sticky_keys_overlay.cc',
       'sticky_keys/sticky_keys_overlay.h',
       'sticky_keys/sticky_keys_state.h',
-      'system/audio/audio_observer.h',
-      'system/audio/tray_audio.cc',
-      'system/audio/tray_audio.h',
-      'system/audio/tray_audio_delegate.h',
-      'system/audio/volume_view.cc',
-      'system/audio/volume_view.h',
       'system/brightness_control_delegate.h',
       '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',
@@ skipping 369 matching lines @@
     'ash_unittests_sources': [
       'accelerators/accelerator_commands_unittest.cc',
       '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/display/display_info_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/ime/tray_ime_chromeos_unittest.cc',
       'common/system/tray/tray_details_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',
       'display/display_error_observer_chromeos_unittest.cc',
-      'display/display_info_unittest.cc',
       'display/display_manager_unittest.cc',
       'display/display_util_unittest.cc',
       'display/extended_mouse_warp_controller_unittest.cc',
       'display/json_converter_unittest.cc',
       'display/mirror_window_controller_unittest.cc',
       'display/mouse_cursor_event_filter_unittest.cc',
       'display/projecting_observer_chromeos_unittest.cc',
       'display/resolution_notification_controller_unittest.cc',
       'display/root_window_transformers_unittest.cc',
       'display/screen_ash_unittest.cc',
@@ skipping 526 matching lines @@
                   '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
                 ],
               }
             ],
           ],
         },
       ],
     }],
   ],
 }