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

Side by Side Diff: ash/ash.gyp

Issue 2046513003: mash: Move shelf model and item classes to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@initshelfearly
Patch Set: 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/accelerators/accelerator_controller.cc ('k') | ash/common/shelf/shelf_item_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.cc', 10 'accelerators/accelerator_commands.cc',
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
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', 66 'common/shelf/shelf_constants.cc',
67 'common/shelf/shelf_constants.h', 67 'common/shelf/shelf_constants.h',
68 'common/shelf/shelf_item_delegate.h',
69 'common/shelf/shelf_item_delegate_manager.cc',
70 'common/shelf/shelf_item_delegate_manager.h',
71 'common/shelf/shelf_item_types.cc',
72 'common/shelf/shelf_item_types.h',
73 'common/shelf/shelf_model.cc',
74 'common/shelf/shelf_model.h',
75 'common/shelf/shelf_model_observer.h',
68 'common/shelf/shelf_types.h', 76 'common/shelf/shelf_types.h',
69 'common/shelf/wm_shelf.h', 77 'common/shelf/wm_shelf.h',
70 'common/shelf/wm_shelf_observer.h', 78 'common/shelf/wm_shelf_observer.h',
71 'common/shelf/wm_shelf_util.cc', 79 'common/shelf/wm_shelf_util.cc',
72 'common/shelf/wm_shelf_util.h', 80 'common/shelf/wm_shelf_util.h',
73 'common/shell_window_ids.h', 81 'common/shell_window_ids.h',
74 'common/wm/always_on_top_controller.cc', 82 'common/wm/always_on_top_controller.cc',
75 'common/wm/always_on_top_controller.h', 83 'common/wm/always_on_top_controller.h',
76 'common/wm/background_animator.cc', 84 'common/wm/background_animator.cc',
77 'common/wm/background_animator.h', 85 'common/wm/background_animator.h',
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 'shelf/shelf_alignment_menu.cc', 354 'shelf/shelf_alignment_menu.cc',
347 'shelf/shelf_alignment_menu.h', 355 'shelf/shelf_alignment_menu.h',
348 'shelf/shelf_bezel_event_filter.cc', 356 'shelf/shelf_bezel_event_filter.cc',
349 'shelf/shelf_bezel_event_filter.h', 357 'shelf/shelf_bezel_event_filter.h',
350 'shelf/shelf_button.cc', 358 'shelf/shelf_button.cc',
351 'shelf/shelf_button.h', 359 'shelf/shelf_button.h',
352 'shelf/shelf_button_pressed_metric_tracker.cc', 360 'shelf/shelf_button_pressed_metric_tracker.cc',
353 'shelf/shelf_button_pressed_metric_tracker.h', 361 'shelf/shelf_button_pressed_metric_tracker.h',
354 'shelf/shelf_delegate.h', 362 'shelf/shelf_delegate.h',
355 'shelf/shelf_icon_observer.h', 363 'shelf/shelf_icon_observer.h',
356 'shelf/shelf_item_delegate.h',
357 'shelf/shelf_item_delegate_manager.cc',
358 'shelf/shelf_item_delegate_manager.h',
359 'shelf/shelf_item_types.cc',
360 'shelf/shelf_item_types.h',
361 'shelf/shelf_layout_manager.cc', 364 'shelf/shelf_layout_manager.cc',
362 'shelf/shelf_layout_manager.h', 365 'shelf/shelf_layout_manager.h',
363 'shelf/shelf_layout_manager_observer.h', 366 'shelf/shelf_layout_manager_observer.h',
364 'shelf/shelf_locking_manager.cc', 367 'shelf/shelf_locking_manager.cc',
365 'shelf/shelf_locking_manager.h', 368 'shelf/shelf_locking_manager.h',
366 'shelf/shelf_menu_model.h', 369 'shelf/shelf_menu_model.h',
367 'shelf/shelf_model.cc',
368 'shelf/shelf_model.h',
369 'shelf/shelf_model_observer.h',
370 'shelf/shelf_navigator.cc', 370 'shelf/shelf_navigator.cc',
371 'shelf/shelf_navigator.h', 371 'shelf/shelf_navigator.h',
372 'shelf/shelf_tooltip_manager.cc', 372 'shelf/shelf_tooltip_manager.cc',
373 'shelf/shelf_tooltip_manager.h', 373 'shelf/shelf_tooltip_manager.h',
374 'shelf/shelf_util.cc', 374 'shelf/shelf_util.cc',
375 'shelf/shelf_util.h', 375 'shelf/shelf_util.h',
376 'shelf/shelf_view.cc', 376 'shelf/shelf_view.cc',
377 'shelf/shelf_view.h', 377 'shelf/shelf_view.h',
378 'shelf/shelf_widget.cc', 378 'shelf/shelf_widget.cc',
379 'shelf/shelf_widget.h', 379 'shelf/shelf_widget.h',
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 'ash_unittests_sources': [ 878 'ash_unittests_sources': [
879 'accelerators/accelerator_commands_unittest.cc', 879 'accelerators/accelerator_commands_unittest.cc',
880 'accelerators/accelerator_controller_unittest.cc', 880 'accelerators/accelerator_controller_unittest.cc',
881 'accelerators/accelerator_filter_unittest.cc', 881 'accelerators/accelerator_filter_unittest.cc',
882 'accelerators/accelerator_table_unittest.cc', 882 'accelerators/accelerator_table_unittest.cc',
883 'accelerators/magnifier_key_scroller_unittest.cc', 883 'accelerators/magnifier_key_scroller_unittest.cc',
884 'accelerators/spoken_feedback_toggler_unittest.cc', 884 'accelerators/spoken_feedback_toggler_unittest.cc',
885 'app_list/app_list_presenter_delegate_unittest.cc', 885 'app_list/app_list_presenter_delegate_unittest.cc',
886 'ash_touch_exploration_manager_chromeos_unittest.cc', 886 'ash_touch_exploration_manager_chromeos_unittest.cc',
887 'autoclick/autoclick_unittest.cc', 887 'autoclick/autoclick_unittest.cc',
888 'common/shelf/shelf_model_unittest.cc',
888 'content/display/screen_orientation_controller_chromeos_unittest.cc', 889 'content/display/screen_orientation_controller_chromeos_unittest.cc',
889 'content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc', 890 'content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc',
890 'content/keyboard_overlay/keyboard_overlay_view_unittest.cc', 891 'content/keyboard_overlay/keyboard_overlay_view_unittest.cc',
891 'desktop_background/desktop_background_controller_unittest.cc', 892 'desktop_background/desktop_background_controller_unittest.cc',
892 'dip_unittest.cc', 893 'dip_unittest.cc',
893 'display/cursor_window_controller_unittest.cc', 894 'display/cursor_window_controller_unittest.cc',
894 'display/display_change_observer_chromeos_unittest.cc', 895 'display/display_change_observer_chromeos_unittest.cc',
895 'display/display_color_manager_chromeos_unittest.cc', 896 'display/display_color_manager_chromeos_unittest.cc',
896 'display/display_error_observer_chromeos_unittest.cc', 897 'display/display_error_observer_chromeos_unittest.cc',
897 'display/display_info_unittest.cc', 898 'display/display_info_unittest.cc',
(...skipping 26 matching lines...) Expand all
924 'metrics/task_switch_time_tracker_unittest.cc', 925 'metrics/task_switch_time_tracker_unittest.cc',
925 'metrics/user_metrics_recorder_unittest.cc', 926 'metrics/user_metrics_recorder_unittest.cc',
926 'popup_message_unittest.cc', 927 'popup_message_unittest.cc',
927 'root_window_controller_unittest.cc', 928 'root_window_controller_unittest.cc',
928 'rotator/screen_rotation_animation_unittest.cc', 929 'rotator/screen_rotation_animation_unittest.cc',
929 'screen_util_unittest.cc', 930 'screen_util_unittest.cc',
930 'shelf/scoped_observer_with_duplicated_sources_unittest.cc', 931 'shelf/scoped_observer_with_duplicated_sources_unittest.cc',
931 'shelf/shelf_button_pressed_metric_tracker_unittest.cc', 932 'shelf/shelf_button_pressed_metric_tracker_unittest.cc',
932 'shelf/shelf_layout_manager_unittest.cc', 933 'shelf/shelf_layout_manager_unittest.cc',
933 'shelf/shelf_locking_manager_unittest.cc', 934 'shelf/shelf_locking_manager_unittest.cc',
934 'shelf/shelf_model_unittest.cc',
935 'shelf/shelf_navigator_unittest.cc', 935 'shelf/shelf_navigator_unittest.cc',
936 'shelf/shelf_tooltip_manager_unittest.cc', 936 'shelf/shelf_tooltip_manager_unittest.cc',
937 'shelf/shelf_unittest.cc', 937 'shelf/shelf_unittest.cc',
938 'shelf/shelf_view_unittest.cc', 938 'shelf/shelf_view_unittest.cc',
939 'shelf/shelf_widget_unittest.cc', 939 'shelf/shelf_widget_unittest.cc',
940 'shelf/shelf_window_watcher_unittest.cc', 940 'shelf/shelf_window_watcher_unittest.cc',
941 'shell_unittest.cc', 941 'shell_unittest.cc',
942 'sticky_keys/sticky_keys_overlay_unittest.cc', 942 'sticky_keys/sticky_keys_overlay_unittest.cc',
943 'sticky_keys/sticky_keys_unittest.cc', 943 'sticky_keys/sticky_keys_unittest.cc',
944 'system/chromeos/brightness/tray_brightness_unittest.cc', 944 'system/chromeos/brightness/tray_brightness_unittest.cc',
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
1440 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1440 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1441 ], 1441 ],
1442 } 1442 }
1443 ], 1443 ],
1444 ], 1444 ],
1445 }, 1445 },
1446 ], 1446 ],
1447 }], 1447 }],
1448 ], 1448 ],
1449 } 1449 }
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/common/shelf/shelf_item_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698