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

Unified Diff: ash/ash.gyp

Issue 2084533008: mash: Migrate tray audio and deps to common. (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 | « no previous file | ash/aura/wm_shell_aura.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 f514ccf436698d001e57bbc5a13aba9c8339ee6a..20435e85cde209672af9c860f28ad6cae9cba944 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -64,6 +64,8 @@
'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',
@@ -101,6 +103,12 @@
'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',
@@ -317,8 +325,6 @@
'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',
@@ -502,12 +508,6 @@
'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',
@@ -897,6 +897,7 @@
'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',
@@ -915,7 +916,6 @@
'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',
« no previous file with comments | « no previous file | ash/aura/wm_shell_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698