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

Unified Diff: ash/ash.gyp

Issue 2099603002: Reland: mash: Convert TrayBackgroundView to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix conflict 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/common/system/tray/system_tray_bubble.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 20435e85cde209672af9c860f28ad6cae9cba944..358bfc9758d89c182126f3a1088edc525f676fce 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -156,20 +156,28 @@
'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/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',
'common/system/tray/tray_details_view.cc',
'common/system/tray/tray_details_view.h',
'common/system/tray/tray_empty.cc',
'common/system/tray/tray_empty.h',
+ 'common/system/tray/tray_event_filter.cc',
+ 'common/system/tray/tray_event_filter.h',
'common/system/tray/tray_image_item.cc',
'common/system/tray/tray_image_item.h',
'common/system/tray/tray_item_more.cc',
@@ -608,16 +616,8 @@
'system/tray/media_security/multi_profile_media_tray_item.h',
'system/tray/system_tray.cc',
'system/tray/system_tray.h',
- 'system/tray/system_tray_bubble.cc',
- 'system/tray/system_tray_bubble.h',
'system/tray/system_tray_notifier.cc',
'system/tray/system_tray_notifier.h',
- 'system/tray/tray_background_view.cc',
- 'system/tray/tray_background_view.h',
- 'system/tray/tray_bubble_wrapper.cc',
- 'system/tray/tray_bubble_wrapper.h',
- 'system/tray/tray_event_filter.cc',
- 'system/tray/tray_event_filter.h',
'system/user/button_from_view.cc',
'system/user/button_from_view.h',
'system/user/login_status.cc',
« no previous file with comments | « no previous file | ash/common/system/tray/system_tray_bubble.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698