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

Side by Side Diff: ash/ash.gyp

Issue 2177663002: mash: Move ownership of ShelfDelegate to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix wallpaper tests again 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 unified diff | Download patch
« no previous file with comments | « no previous file | ash/common/shelf/shelf_delegate.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_aura.cc', 10 'accelerators/accelerator_commands_aura.cc',
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 'common/shelf/overflow_bubble.cc', 103 'common/shelf/overflow_bubble.cc',
104 'common/shelf/overflow_bubble.h', 104 'common/shelf/overflow_bubble.h',
105 'common/shelf/overflow_bubble_view.cc', 105 'common/shelf/overflow_bubble_view.cc',
106 'common/shelf/overflow_bubble_view.h', 106 'common/shelf/overflow_bubble_view.h',
107 'common/shelf/overflow_button.cc', 107 'common/shelf/overflow_button.cc',
108 'common/shelf/overflow_button.h', 108 'common/shelf/overflow_button.h',
109 'common/shelf/shelf_alignment_menu.cc', 109 'common/shelf/shelf_alignment_menu.cc',
110 'common/shelf/shelf_alignment_menu.h', 110 'common/shelf/shelf_alignment_menu.h',
111 'common/shelf/shelf_constants.cc', 111 'common/shelf/shelf_constants.cc',
112 'common/shelf/shelf_constants.h', 112 'common/shelf/shelf_constants.h',
113 'common/shelf/shelf_delegate.h',
113 'common/shelf/shelf_item_delegate.h', 114 'common/shelf/shelf_item_delegate.h',
114 'common/shelf/shelf_item_types.cc', 115 'common/shelf/shelf_item_types.cc',
115 'common/shelf/shelf_item_types.h', 116 'common/shelf/shelf_item_types.h',
116 'common/shelf/shelf_locking_manager.cc', 117 'common/shelf/shelf_locking_manager.cc',
117 'common/shelf/shelf_locking_manager.h', 118 'common/shelf/shelf_locking_manager.h',
118 'common/shelf/shelf_menu_model.h', 119 'common/shelf/shelf_menu_model.h',
119 'common/shelf/shelf_model.cc', 120 'common/shelf/shelf_model.cc',
120 'common/shelf/shelf_model.h', 121 'common/shelf/shelf_model.h',
121 'common/shelf/shelf_model_observer.h', 122 'common/shelf/shelf_model_observer.h',
122 'common/shelf/shelf_navigator.cc', 123 'common/shelf/shelf_navigator.cc',
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 'screenshot_delegate.h', 612 'screenshot_delegate.h',
612 'shelf/scoped_observer_with_duplicated_sources.h', 613 'shelf/scoped_observer_with_duplicated_sources.h',
613 'shelf/shelf.cc', 614 'shelf/shelf.cc',
614 'shelf/shelf.h', 615 'shelf/shelf.h',
615 'shelf/shelf_bezel_event_filter.cc', 616 'shelf/shelf_bezel_event_filter.cc',
616 'shelf/shelf_bezel_event_filter.h', 617 'shelf/shelf_bezel_event_filter.h',
617 'shelf/shelf_button.cc', 618 'shelf/shelf_button.cc',
618 'shelf/shelf_button.h', 619 'shelf/shelf_button.h',
619 'shelf/shelf_button_pressed_metric_tracker.cc', 620 'shelf/shelf_button_pressed_metric_tracker.cc',
620 'shelf/shelf_button_pressed_metric_tracker.h', 621 'shelf/shelf_button_pressed_metric_tracker.h',
621 'shelf/shelf_delegate.h',
622 'shelf/shelf_icon_observer.h', 622 'shelf/shelf_icon_observer.h',
623 'shelf/shelf_layout_manager.cc', 623 'shelf/shelf_layout_manager.cc',
624 'shelf/shelf_layout_manager.h', 624 'shelf/shelf_layout_manager.h',
625 'shelf/shelf_layout_manager_observer.h', 625 'shelf/shelf_layout_manager_observer.h',
626 'shelf/shelf_tooltip_manager.cc', 626 'shelf/shelf_tooltip_manager.cc',
627 'shelf/shelf_tooltip_manager.h', 627 'shelf/shelf_tooltip_manager.h',
628 'shelf/shelf_util.cc', 628 'shelf/shelf_util.cc',
629 'shelf/shelf_util.h', 629 'shelf/shelf_util.h',
630 'shelf/shelf_view.cc', 630 'shelf/shelf_view.cc',
631 'shelf/shelf_view.h', 631 'shelf/shelf_view.h',
(...skipping 832 matching lines...) Expand 10 before | Expand all | Expand 10 after
1464 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1464 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1465 ], 1465 ],
1466 } 1466 }
1467 ], 1467 ],
1468 ], 1468 ],
1469 }, 1469 },
1470 ], 1470 ],
1471 }], 1471 }],
1472 ], 1472 ],
1473 } 1473 }
OLDNEW
« no previous file with comments | « no previous file | ash/common/shelf/shelf_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698