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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/ash.gyp

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay
Patch Set: rebase Created 4 years, 5 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_controller.cc ('k') | ash/common/system/DEPS » ('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 e3a9a2fc629a5208d43bb0d59a312a37c7230950..a6cfa31569320fbb728035ecd272ebd68a1c76e9 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -219,6 +219,8 @@
'common/system/networking_config_delegate.h',
'common/system/overview/overview_button_tray.cc',
'common/system/overview/overview_button_tray.h',
+ 'common/system/status_area_widget.cc',
+ 'common/system/status_area_widget.h',
'common/system/status_area_widget_delegate.cc',
'common/system/status_area_widget_delegate.h',
'common/system/system_notifier.cc',
@@ -243,6 +245,8 @@
'common/system/tray/label_tray_view.h',
'common/system/tray/special_popup_row.cc',
'common/system/tray/special_popup_row.h',
+ 'common/system/tray/system_tray.cc',
+ 'common/system/tray/system_tray.h',
'common/system/tray/system_tray_bubble.cc',
'common/system/tray/system_tray_bubble.h',
'common/system/tray/system_tray_delegate.cc',
@@ -634,10 +638,6 @@
'system/chromeos/rotation/tray_rotation_lock.h',
'system/chromeos/tray_display.cc',
'system/chromeos/tray_display.h',
- 'system/status_area_widget.cc',
- 'system/status_area_widget.h',
- 'system/tray/system_tray.cc',
- 'system/tray/system_tray.h',
'touch/touch_hud_debug.cc',
'touch/touch_hud_debug.h',
'touch/touch_hud_projection.cc',
@@ -903,6 +903,7 @@
'common/system/chromeos/supervised/tray_supervised_user_unittest.cc',
'common/system/date/date_view_unittest.cc',
'common/system/ime/tray_ime_chromeos_unittest.cc',
+ 'common/system/tray/system_tray_unittest.cc',
'common/system/tray/tray_details_view_unittest.cc',
'common/system/update/tray_update_unittest.cc',
'common/system/user/tray_user_unittest.cc',
@@ -965,7 +966,6 @@
'system/chromeos/tray_display_unittest.cc',
'system/overview/overview_button_tray_unittest.cc',
'system/toast/toast_manager_unittest.cc',
- 'system/tray/system_tray_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',
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/common/system/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698