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

Side by Side Diff: ash/ash.gyp

Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again 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 | « ash/app_list/app_list_presenter_delegate.cc ('k') | ash/aura/wm_root_window_controller_aura.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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 'aura/wm_window_aura.cc', 56 'aura/wm_window_aura.cc',
57 'aura/wm_window_aura.h', 57 'aura/wm_window_aura.h',
58 'autoclick/autoclick_controller.cc', 58 'autoclick/autoclick_controller.cc',
59 'autoclick/autoclick_controller.h', 59 'autoclick/autoclick_controller.h',
60 'cancel_mode.cc', 60 'cancel_mode.cc',
61 'cancel_mode.h', 61 'cancel_mode.h',
62 'cast_config_delegate.cc', 62 'cast_config_delegate.cc',
63 'cast_config_delegate.h', 63 'cast_config_delegate.h',
64 'common/root_window_controller_common.cc', 64 'common/root_window_controller_common.cc',
65 'common/root_window_controller_common.h', 65 'common/root_window_controller_common.h',
66 'common/shelf/shelf_constants.cc',
67 'common/shelf/shelf_constants.h',
68 'common/shelf/shelf_types.h',
69 'common/shelf/wm_shelf.h',
70 'common/shelf/wm_shelf_observer.h',
71 'common/shelf/wm_shelf_util.cc',
72 'common/shelf/wm_shelf_util.h',
66 'common/shell_window_ids.h', 73 'common/shell_window_ids.h',
67 'common/wm/always_on_top_controller.cc', 74 'common/wm/always_on_top_controller.cc',
68 'common/wm/always_on_top_controller.h', 75 'common/wm/always_on_top_controller.h',
69 'common/wm/background_animator.cc', 76 'common/wm/background_animator.cc',
70 'common/wm/background_animator.h', 77 'common/wm/background_animator.h',
71 'common/wm/container_finder.cc', 78 'common/wm/container_finder.cc',
72 'common/wm/container_finder.h', 79 'common/wm/container_finder.h',
73 'common/wm/default_state.cc', 80 'common/wm/default_state.cc',
74 'common/wm/default_state.h', 81 'common/wm/default_state.h',
75 'common/wm/default_window_resizer.cc', 82 'common/wm/default_window_resizer.cc',
76 'common/wm/default_window_resizer.h', 83 'common/wm/default_window_resizer.h',
77 'common/wm/dock/docked_window_layout_manager.cc', 84 'common/wm/dock/docked_window_layout_manager.cc',
78 'common/wm/dock/docked_window_layout_manager.h', 85 'common/wm/dock/docked_window_layout_manager.h',
79 'common/wm/dock/docked_window_layout_manager_observer.h', 86 'common/wm/dock/docked_window_layout_manager_observer.h',
80 'common/wm/dock/docked_window_resizer.cc', 87 'common/wm/dock/docked_window_resizer.cc',
81 'common/wm/dock/docked_window_resizer.h', 88 'common/wm/dock/docked_window_resizer.h',
82 'common/wm/drag_details.cc', 89 'common/wm/drag_details.cc',
83 'common/wm/drag_details.h', 90 'common/wm/drag_details.h',
84 'common/wm/fullscreen_window_finder.cc', 91 'common/wm/fullscreen_window_finder.cc',
85 'common/wm/fullscreen_window_finder.h', 92 'common/wm/fullscreen_window_finder.h',
86 'common/wm/panels/panel_layout_manager.cc', 93 'common/wm/panels/panel_layout_manager.cc',
87 'common/wm/panels/panel_layout_manager.h', 94 'common/wm/panels/panel_layout_manager.h',
88 'common/wm/panels/panel_window_resizer.cc', 95 'common/wm/panels/panel_window_resizer.cc',
89 'common/wm/panels/panel_window_resizer.h', 96 'common/wm/panels/panel_window_resizer.h',
90 'common/wm/root_window_finder.cc', 97 'common/wm/root_window_finder.cc',
91 'common/wm/root_window_finder.h', 98 'common/wm/root_window_finder.h',
92 'common/wm/root_window_layout_manager.cc', 99 'common/wm/root_window_layout_manager.cc',
93 'common/wm/root_window_layout_manager.h', 100 'common/wm/root_window_layout_manager.h',
94 'common/wm/shelf/wm_shelf.h',
95 'common/wm/shelf/wm_shelf_constants.cc',
96 'common/wm/shelf/wm_shelf_constants.h',
97 'common/wm/shelf/wm_shelf_observer.h',
98 'common/wm/shelf/wm_shelf_types.h', 101 'common/wm/shelf/wm_shelf_types.h',
99 'common/wm/shelf/wm_shelf_util.cc',
100 'common/wm/shelf/wm_shelf_util.h',
101 'common/wm/switchable_windows.cc', 102 'common/wm/switchable_windows.cc',
102 'common/wm/switchable_windows.h', 103 'common/wm/switchable_windows.h',
103 'common/wm/window_animation_types.h', 104 'common/wm/window_animation_types.h',
104 'common/wm/window_parenting_utils.cc', 105 'common/wm/window_parenting_utils.cc',
105 'common/wm/window_parenting_utils.h', 106 'common/wm/window_parenting_utils.h',
106 'common/wm/window_positioner.cc', 107 'common/wm/window_positioner.cc',
107 'common/wm/window_positioner.h', 108 'common/wm/window_positioner.h',
108 'common/wm/window_positioning_utils.cc', 109 'common/wm/window_positioning_utils.cc',
109 'common/wm/window_positioning_utils.h', 110 'common/wm/window_positioning_utils.h',
110 'common/wm/window_resizer.cc', 111 'common/wm/window_resizer.cc',
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 'shelf/shelf.cc', 345 'shelf/shelf.cc',
345 'shelf/shelf.h', 346 'shelf/shelf.h',
346 'shelf/shelf_alignment_menu.cc', 347 'shelf/shelf_alignment_menu.cc',
347 'shelf/shelf_alignment_menu.h', 348 'shelf/shelf_alignment_menu.h',
348 'shelf/shelf_bezel_event_filter.cc', 349 'shelf/shelf_bezel_event_filter.cc',
349 'shelf/shelf_bezel_event_filter.h', 350 'shelf/shelf_bezel_event_filter.h',
350 'shelf/shelf_button.cc', 351 'shelf/shelf_button.cc',
351 'shelf/shelf_button.h', 352 'shelf/shelf_button.h',
352 'shelf/shelf_button_pressed_metric_tracker.cc', 353 'shelf/shelf_button_pressed_metric_tracker.cc',
353 'shelf/shelf_button_pressed_metric_tracker.h', 354 'shelf/shelf_button_pressed_metric_tracker.h',
354 'shelf/shelf_constants.cc',
355 'shelf/shelf_constants.h',
356 'shelf/shelf_delegate.h', 355 'shelf/shelf_delegate.h',
357 'shelf/shelf_icon_observer.h', 356 'shelf/shelf_icon_observer.h',
358 'shelf/shelf_item_delegate.h', 357 'shelf/shelf_item_delegate.h',
359 'shelf/shelf_item_delegate_manager.cc', 358 'shelf/shelf_item_delegate_manager.cc',
360 'shelf/shelf_item_delegate_manager.h', 359 'shelf/shelf_item_delegate_manager.h',
361 'shelf/shelf_item_types.cc', 360 'shelf/shelf_item_types.cc',
362 'shelf/shelf_item_types.h', 361 'shelf/shelf_item_types.h',
363 'shelf/shelf_layout_manager.cc', 362 'shelf/shelf_layout_manager.cc',
364 'shelf/shelf_layout_manager.h', 363 'shelf/shelf_layout_manager.h',
365 'shelf/shelf_layout_manager_observer.h', 364 'shelf/shelf_layout_manager_observer.h',
366 'shelf/shelf_locking_manager.cc', 365 'shelf/shelf_locking_manager.cc',
367 'shelf/shelf_locking_manager.h', 366 'shelf/shelf_locking_manager.h',
368 'shelf/shelf_menu_model.h', 367 'shelf/shelf_menu_model.h',
369 'shelf/shelf_model.cc', 368 'shelf/shelf_model.cc',
370 'shelf/shelf_model.h', 369 'shelf/shelf_model.h',
371 'shelf/shelf_model_observer.h', 370 'shelf/shelf_model_observer.h',
372 'shelf/shelf_navigator.cc', 371 'shelf/shelf_navigator.cc',
373 'shelf/shelf_navigator.h', 372 'shelf/shelf_navigator.h',
374 'shelf/shelf_tooltip_manager.cc', 373 'shelf/shelf_tooltip_manager.cc',
375 'shelf/shelf_tooltip_manager.h', 374 'shelf/shelf_tooltip_manager.h',
376 'shelf/shelf_types.h',
377 'shelf/shelf_util.cc', 375 'shelf/shelf_util.cc',
378 'shelf/shelf_util.h', 376 'shelf/shelf_util.h',
379 'shelf/shelf_view.cc', 377 'shelf/shelf_view.cc',
380 'shelf/shelf_view.h', 378 'shelf/shelf_view.h',
381 'shelf/shelf_widget.cc', 379 'shelf/shelf_widget.cc',
382 'shelf/shelf_widget.h', 380 'shelf/shelf_widget.h',
383 'shelf/shelf_window_watcher.cc', 381 'shelf/shelf_window_watcher.cc',
384 'shelf/shelf_window_watcher.h', 382 'shelf/shelf_window_watcher.h',
385 'shelf/shelf_window_watcher_item_delegate.cc', 383 'shelf/shelf_window_watcher_item_delegate.cc',
386 'shelf/shelf_window_watcher_item_delegate.h', 384 'shelf/shelf_window_watcher_item_delegate.h',
(...skipping 1056 matching lines...) Expand 10 before | Expand all | Expand 10 after
1443 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1441 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1444 ], 1442 ],
1445 } 1443 }
1446 ], 1444 ],
1447 ], 1445 ],
1448 }, 1446 },
1449 ], 1447 ],
1450 }], 1448 }],
1451 ], 1449 ],
1452 } 1450 }
OLDNEW
« no previous file with comments | « ash/app_list/app_list_presenter_delegate.cc ('k') | ash/aura/wm_root_window_controller_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698