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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | ash/common/system/tray/system_tray_bubble.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # These files lists are shared with the GN build. 8 # These files lists are shared with the GN build.
9 'ash_sources': [ 9 'ash_sources': [
10 'accelerators/accelerator_commands.cc', 10 'accelerators/accelerator_commands.cc',
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 'common/system/tray/default_system_tray_delegate.cc', 149 'common/system/tray/default_system_tray_delegate.cc',
150 'common/system/tray/default_system_tray_delegate.h', 150 'common/system/tray/default_system_tray_delegate.h',
151 'common/system/tray/fixed_sized_image_view.cc', 151 'common/system/tray/fixed_sized_image_view.cc',
152 'common/system/tray/fixed_sized_image_view.h', 152 'common/system/tray/fixed_sized_image_view.h',
153 'common/system/tray/fixed_sized_scroll_view.cc', 153 'common/system/tray/fixed_sized_scroll_view.cc',
154 'common/system/tray/fixed_sized_scroll_view.h', 154 'common/system/tray/fixed_sized_scroll_view.h',
155 'common/system/tray/hover_highlight_view.cc', 155 'common/system/tray/hover_highlight_view.cc',
156 'common/system/tray/hover_highlight_view.h', 156 'common/system/tray/hover_highlight_view.h',
157 'common/system/tray/special_popup_row.cc', 157 'common/system/tray/special_popup_row.cc',
158 'common/system/tray/special_popup_row.h', 158 'common/system/tray/special_popup_row.h',
159 'common/system/tray/system_tray_bubble.cc',
160 'common/system/tray/system_tray_bubble.h',
159 'common/system/tray/system_tray_delegate.cc', 161 'common/system/tray/system_tray_delegate.cc',
160 'common/system/tray/system_tray_delegate.h', 162 'common/system/tray/system_tray_delegate.h',
161 'common/system/tray/system_tray_item.cc', 163 'common/system/tray/system_tray_item.cc',
162 'common/system/tray/system_tray_item.h', 164 'common/system/tray/system_tray_item.h',
163 'common/system/tray/throbber_view.cc', 165 'common/system/tray/throbber_view.cc',
164 'common/system/tray/throbber_view.h', 166 'common/system/tray/throbber_view.h',
167 'common/system/tray/tray_background_view.cc',
168 'common/system/tray/tray_background_view.h',
165 'common/system/tray/tray_bar_button_with_title.cc', 169 'common/system/tray/tray_bar_button_with_title.cc',
166 'common/system/tray/tray_bar_button_with_title.h', 170 'common/system/tray/tray_bar_button_with_title.h',
171 'common/system/tray/tray_bubble_wrapper.cc',
172 'common/system/tray/tray_bubble_wrapper.h',
167 'common/system/tray/tray_constants.cc', 173 'common/system/tray/tray_constants.cc',
168 'common/system/tray/tray_constants.h', 174 'common/system/tray/tray_constants.h',
169 'common/system/tray/tray_details_view.cc', 175 'common/system/tray/tray_details_view.cc',
170 'common/system/tray/tray_details_view.h', 176 'common/system/tray/tray_details_view.h',
171 'common/system/tray/tray_empty.cc', 177 'common/system/tray/tray_empty.cc',
172 'common/system/tray/tray_empty.h', 178 'common/system/tray/tray_empty.h',
179 'common/system/tray/tray_event_filter.cc',
180 'common/system/tray/tray_event_filter.h',
173 'common/system/tray/tray_image_item.cc', 181 'common/system/tray/tray_image_item.cc',
174 'common/system/tray/tray_image_item.h', 182 'common/system/tray/tray_image_item.h',
175 'common/system/tray/tray_item_more.cc', 183 'common/system/tray/tray_item_more.cc',
176 'common/system/tray/tray_item_more.h', 184 'common/system/tray/tray_item_more.h',
177 'common/system/tray/tray_item_view.cc', 185 'common/system/tray/tray_item_view.cc',
178 'common/system/tray/tray_item_view.h', 186 'common/system/tray/tray_item_view.h',
179 'common/system/tray/tray_notification_view.cc', 187 'common/system/tray/tray_notification_view.cc',
180 'common/system/tray/tray_notification_view.h', 188 'common/system/tray/tray_notification_view.h',
181 'common/system/tray/tray_popup_header_button.cc', 189 'common/system/tray/tray_popup_header_button.cc',
182 'common/system/tray/tray_popup_header_button.h', 190 'common/system/tray/tray_popup_header_button.h',
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 'system/toast/toast_data.h', 609 'system/toast/toast_data.h',
602 'system/toast/toast_manager.cc', 610 'system/toast/toast_manager.cc',
603 'system/toast/toast_manager.h', 611 'system/toast/toast_manager.h',
604 'system/toast/toast_overlay.cc', 612 'system/toast/toast_overlay.cc',
605 'system/toast/toast_overlay.h', 613 'system/toast/toast_overlay.h',
606 'system/tray/media_security/media_capture_observer.h', 614 'system/tray/media_security/media_capture_observer.h',
607 'system/tray/media_security/multi_profile_media_tray_item.cc', 615 'system/tray/media_security/multi_profile_media_tray_item.cc',
608 'system/tray/media_security/multi_profile_media_tray_item.h', 616 'system/tray/media_security/multi_profile_media_tray_item.h',
609 'system/tray/system_tray.cc', 617 'system/tray/system_tray.cc',
610 'system/tray/system_tray.h', 618 'system/tray/system_tray.h',
611 'system/tray/system_tray_bubble.cc',
612 'system/tray/system_tray_bubble.h',
613 'system/tray/system_tray_notifier.cc', 619 'system/tray/system_tray_notifier.cc',
614 'system/tray/system_tray_notifier.h', 620 'system/tray/system_tray_notifier.h',
615 'system/tray/tray_background_view.cc',
616 'system/tray/tray_background_view.h',
617 'system/tray/tray_bubble_wrapper.cc',
618 'system/tray/tray_bubble_wrapper.h',
619 'system/tray/tray_event_filter.cc',
620 'system/tray/tray_event_filter.h',
621 'system/user/button_from_view.cc', 621 'system/user/button_from_view.cc',
622 'system/user/button_from_view.h', 622 'system/user/button_from_view.h',
623 'system/user/login_status.cc', 623 'system/user/login_status.cc',
624 'system/user/login_status.h', 624 'system/user/login_status.h',
625 'system/user/rounded_image_view.cc', 625 'system/user/rounded_image_view.cc',
626 'system/user/rounded_image_view.h', 626 'system/user/rounded_image_view.h',
627 'system/user/tray_user.cc', 627 'system/user/tray_user.cc',
628 'system/user/tray_user.h', 628 'system/user/tray_user.h',
629 'system/user/tray_user_separator.cc', 629 'system/user/tray_user_separator.cc',
630 'system/user/tray_user_separator.h', 630 'system/user/tray_user_separator.h',
(...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after
1455 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1455 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1456 ], 1456 ],
1457 } 1457 }
1458 ], 1458 ],
1459 ], 1459 ],
1460 }, 1460 },
1461 ], 1461 ],
1462 }], 1462 }],
1463 ], 1463 ],
1464 } 1464 }
OLDNEW
« 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