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 2166043003: mash: Migrate ShelfLockingManager to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move ShelfLockingManager test access to Shelf. 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
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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 'common/shelf/overflow_button.h', 102 'common/shelf/overflow_button.h',
103 'common/shelf/shelf_alignment_menu.cc', 103 'common/shelf/shelf_alignment_menu.cc',
104 'common/shelf/shelf_alignment_menu.h', 104 'common/shelf/shelf_alignment_menu.h',
105 'common/shelf/shelf_constants.cc', 105 'common/shelf/shelf_constants.cc',
106 'common/shelf/shelf_constants.h', 106 'common/shelf/shelf_constants.h',
107 'common/shelf/shelf_item_delegate.h', 107 'common/shelf/shelf_item_delegate.h',
108 'common/shelf/shelf_item_delegate_manager.cc', 108 'common/shelf/shelf_item_delegate_manager.cc',
109 'common/shelf/shelf_item_delegate_manager.h', 109 'common/shelf/shelf_item_delegate_manager.h',
110 'common/shelf/shelf_item_types.cc', 110 'common/shelf/shelf_item_types.cc',
111 'common/shelf/shelf_item_types.h', 111 'common/shelf/shelf_item_types.h',
112 'common/shelf/shelf_locking_manager.cc',
113 'common/shelf/shelf_locking_manager.h',
112 'common/shelf/shelf_menu_model.h', 114 'common/shelf/shelf_menu_model.h',
113 'common/shelf/shelf_model.cc', 115 'common/shelf/shelf_model.cc',
114 'common/shelf/shelf_model.h', 116 'common/shelf/shelf_model.h',
115 'common/shelf/shelf_model_observer.h', 117 'common/shelf/shelf_model_observer.h',
116 'common/shelf/shelf_types.h', 118 'common/shelf/shelf_types.h',
117 'common/shelf/wm_shelf.h', 119 'common/shelf/wm_shelf.h',
118 'common/shelf/wm_shelf_observer.h', 120 'common/shelf/wm_shelf_observer.h',
119 'common/shelf/wm_shelf_util.cc', 121 'common/shelf/wm_shelf_util.cc',
120 'common/shelf/wm_shelf_util.h', 122 'common/shelf/wm_shelf_util.h',
121 'common/shell_delegate.h', 123 'common/shell_delegate.h',
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 'common/wm/dock/docked_window_resizer.cc', 351 'common/wm/dock/docked_window_resizer.cc',
350 'common/wm/dock/docked_window_resizer.h', 352 'common/wm/dock/docked_window_resizer.h',
351 'common/wm/drag_details.cc', 353 'common/wm/drag_details.cc',
352 'common/wm/drag_details.h', 354 'common/wm/drag_details.h',
353 'common/wm/focus_rules.cc', 355 'common/wm/focus_rules.cc',
354 'common/wm/focus_rules.h', 356 'common/wm/focus_rules.h',
355 'common/wm/forwarding_layer_delegate.cc', 357 'common/wm/forwarding_layer_delegate.cc',
356 'common/wm/forwarding_layer_delegate.h', 358 'common/wm/forwarding_layer_delegate.h',
357 'common/wm/fullscreen_window_finder.cc', 359 'common/wm/fullscreen_window_finder.cc',
358 'common/wm/fullscreen_window_finder.h', 360 'common/wm/fullscreen_window_finder.h',
361 'common/wm/lock_state_observer.h',
359 'common/wm/maximize_mode/maximize_mode_controller.cc', 362 'common/wm/maximize_mode/maximize_mode_controller.cc',
360 'common/wm/maximize_mode/maximize_mode_controller.h', 363 'common/wm/maximize_mode/maximize_mode_controller.h',
361 'common/wm/maximize_mode/maximize_mode_event_handler.cc', 364 'common/wm/maximize_mode/maximize_mode_event_handler.cc',
362 'common/wm/maximize_mode/maximize_mode_event_handler.h', 365 'common/wm/maximize_mode/maximize_mode_event_handler.h',
363 'common/wm/maximize_mode/maximize_mode_window_manager.cc', 366 'common/wm/maximize_mode/maximize_mode_window_manager.cc',
364 'common/wm/maximize_mode/maximize_mode_window_manager.h', 367 'common/wm/maximize_mode/maximize_mode_window_manager.h',
365 'common/wm/maximize_mode/maximize_mode_window_state.cc', 368 'common/wm/maximize_mode/maximize_mode_window_state.cc',
366 'common/wm/maximize_mode/maximize_mode_window_state.h', 369 'common/wm/maximize_mode/maximize_mode_window_state.h',
367 'common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h', 370 'common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h',
368 'common/wm/maximize_mode/workspace_backdrop_delegate.cc', 371 'common/wm/maximize_mode/workspace_backdrop_delegate.cc',
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 'shelf/shelf_bezel_event_filter.h', 614 'shelf/shelf_bezel_event_filter.h',
612 'shelf/shelf_button.cc', 615 'shelf/shelf_button.cc',
613 'shelf/shelf_button.h', 616 'shelf/shelf_button.h',
614 'shelf/shelf_button_pressed_metric_tracker.cc', 617 'shelf/shelf_button_pressed_metric_tracker.cc',
615 'shelf/shelf_button_pressed_metric_tracker.h', 618 'shelf/shelf_button_pressed_metric_tracker.h',
616 'shelf/shelf_delegate.h', 619 'shelf/shelf_delegate.h',
617 'shelf/shelf_icon_observer.h', 620 'shelf/shelf_icon_observer.h',
618 'shelf/shelf_layout_manager.cc', 621 'shelf/shelf_layout_manager.cc',
619 'shelf/shelf_layout_manager.h', 622 'shelf/shelf_layout_manager.h',
620 'shelf/shelf_layout_manager_observer.h', 623 'shelf/shelf_layout_manager_observer.h',
621 'shelf/shelf_locking_manager.cc',
622 'shelf/shelf_locking_manager.h',
623 'shelf/shelf_navigator.cc', 624 'shelf/shelf_navigator.cc',
624 'shelf/shelf_navigator.h', 625 'shelf/shelf_navigator.h',
625 'shelf/shelf_tooltip_manager.cc', 626 'shelf/shelf_tooltip_manager.cc',
626 'shelf/shelf_tooltip_manager.h', 627 'shelf/shelf_tooltip_manager.h',
627 'shelf/shelf_util.cc', 628 'shelf/shelf_util.cc',
628 'shelf/shelf_util.h', 629 'shelf/shelf_util.h',
629 'shelf/shelf_view.cc', 630 'shelf/shelf_view.cc',
630 'shelf/shelf_view.h', 631 'shelf/shelf_view.h',
631 'shelf/shelf_widget.cc', 632 'shelf/shelf_widget.cc',
632 'shelf/shelf_widget.h', 633 'shelf/shelf_widget.h',
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 'wm/gestures/shelf_gesture_handler.cc', 692 'wm/gestures/shelf_gesture_handler.cc',
692 'wm/gestures/shelf_gesture_handler.h', 693 'wm/gestures/shelf_gesture_handler.h',
693 'wm/immersive_fullscreen_controller.cc', 694 'wm/immersive_fullscreen_controller.cc',
694 'wm/immersive_fullscreen_controller.h', 695 'wm/immersive_fullscreen_controller.h',
695 'wm/immersive_revealed_lock.cc', 696 'wm/immersive_revealed_lock.cc',
696 'wm/immersive_revealed_lock.h', 697 'wm/immersive_revealed_lock.h',
697 'wm/lock_layout_manager.cc', 698 'wm/lock_layout_manager.cc',
698 'wm/lock_layout_manager.h', 699 'wm/lock_layout_manager.h',
699 'wm/lock_state_controller.cc', 700 'wm/lock_state_controller.cc',
700 'wm/lock_state_controller.h', 701 'wm/lock_state_controller.h',
701 'wm/lock_state_observer.h',
702 'wm/lock_window_state.cc', 702 'wm/lock_window_state.cc',
703 'wm/lock_window_state.h', 703 'wm/lock_window_state.h',
704 'wm/maximize_mode/maximize_mode_event_handler_aura.cc', 704 'wm/maximize_mode/maximize_mode_event_handler_aura.cc',
705 'wm/maximize_mode/maximize_mode_event_handler_aura.h', 705 'wm/maximize_mode/maximize_mode_event_handler_aura.h',
706 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc', 706 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc',
707 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h', 707 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h',
708 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc', 708 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc',
709 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h', 709 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h',
710 'wm/overlay_event_filter.cc', 710 'wm/overlay_event_filter.cc',
711 'wm/overlay_event_filter.h', 711 'wm/overlay_event_filter.h',
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
901 'accelerators/accelerator_filter_unittest.cc', 901 'accelerators/accelerator_filter_unittest.cc',
902 'accelerators/accelerator_table_unittest.cc', 902 'accelerators/accelerator_table_unittest.cc',
903 'accelerators/magnifier_key_scroller_unittest.cc', 903 'accelerators/magnifier_key_scroller_unittest.cc',
904 'accelerators/spoken_feedback_toggler_unittest.cc', 904 'accelerators/spoken_feedback_toggler_unittest.cc',
905 'app_list/app_list_presenter_delegate_unittest.cc', 905 'app_list/app_list_presenter_delegate_unittest.cc',
906 'ash_touch_exploration_manager_chromeos_unittest.cc', 906 'ash_touch_exploration_manager_chromeos_unittest.cc',
907 'autoclick/autoclick_unittest.cc', 907 'autoclick/autoclick_unittest.cc',
908 'common/display/display_info_unittest.cc', 908 'common/display/display_info_unittest.cc',
909 'common/material_design/material_design_controller_unittest.cc', 909 'common/material_design/material_design_controller_unittest.cc',
910 'common/popup_message_unittest.cc', 910 'common/popup_message_unittest.cc',
911 'common/shelf/shelf_locking_manager_unittest.cc',
911 'common/shelf/shelf_model_unittest.cc', 912 'common/shelf/shelf_model_unittest.cc',
912 'common/system/chromeos/brightness/tray_brightness_unittest.cc', 913 'common/system/chromeos/brightness/tray_brightness_unittest.cc',
913 'common/system/chromeos/ime_menu/ime_menu_tray_unittest.cc', 914 'common/system/chromeos/ime_menu/ime_menu_tray_unittest.cc',
914 'common/system/chromeos/media_security/multi_profile_media_tray_item_unitt est.cc', 915 'common/system/chromeos/media_security/multi_profile_media_tray_item_unitt est.cc',
915 'common/system/chromeos/power/power_status_unittest.cc', 916 'common/system/chromeos/power/power_status_unittest.cc',
916 'common/system/chromeos/power/power_status_view_unittest.cc', 917 'common/system/chromeos/power/power_status_view_unittest.cc',
917 'common/system/chromeos/power/tray_power_unittest.cc', 918 'common/system/chromeos/power/tray_power_unittest.cc',
918 'common/system/chromeos/screen_security/screen_tray_item_unittest.cc', 919 'common/system/chromeos/screen_security/screen_tray_item_unittest.cc',
919 'common/system/chromeos/session/logout_confirmation_controller_unittest.cc ', 920 'common/system/chromeos/session/logout_confirmation_controller_unittest.cc ',
920 'common/system/chromeos/session/tray_session_length_limit_unittest.cc', 921 'common/system/chromeos/session/tray_session_length_limit_unittest.cc',
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
961 'metrics/desktop_task_switch_metric_recorder_unittest.cc', 962 'metrics/desktop_task_switch_metric_recorder_unittest.cc',
962 'metrics/task_switch_metrics_recorder_unittest.cc', 963 'metrics/task_switch_metrics_recorder_unittest.cc',
963 'metrics/task_switch_time_tracker_unittest.cc', 964 'metrics/task_switch_time_tracker_unittest.cc',
964 'metrics/user_metrics_recorder_unittest.cc', 965 'metrics/user_metrics_recorder_unittest.cc',
965 'root_window_controller_unittest.cc', 966 'root_window_controller_unittest.cc',
966 'rotator/screen_rotation_animation_unittest.cc', 967 'rotator/screen_rotation_animation_unittest.cc',
967 'screen_util_unittest.cc', 968 'screen_util_unittest.cc',
968 'shelf/scoped_observer_with_duplicated_sources_unittest.cc', 969 'shelf/scoped_observer_with_duplicated_sources_unittest.cc',
969 'shelf/shelf_button_pressed_metric_tracker_unittest.cc', 970 'shelf/shelf_button_pressed_metric_tracker_unittest.cc',
970 'shelf/shelf_layout_manager_unittest.cc', 971 'shelf/shelf_layout_manager_unittest.cc',
971 'shelf/shelf_locking_manager_unittest.cc',
972 'shelf/shelf_navigator_unittest.cc', 972 'shelf/shelf_navigator_unittest.cc',
973 'shelf/shelf_tooltip_manager_unittest.cc', 973 'shelf/shelf_tooltip_manager_unittest.cc',
974 'shelf/shelf_unittest.cc', 974 'shelf/shelf_unittest.cc',
975 'shelf/shelf_view_unittest.cc', 975 'shelf/shelf_view_unittest.cc',
976 'shelf/shelf_widget_unittest.cc', 976 'shelf/shelf_widget_unittest.cc',
977 'shelf/shelf_window_watcher_unittest.cc', 977 'shelf/shelf_window_watcher_unittest.cc',
978 'shell_unittest.cc', 978 'shell_unittest.cc',
979 'sticky_keys/sticky_keys_overlay_unittest.cc', 979 'sticky_keys/sticky_keys_overlay_unittest.cc',
980 'sticky_keys/sticky_keys_unittest.cc', 980 'sticky_keys/sticky_keys_unittest.cc',
981 'system/chromeos/power/power_event_observer_unittest.cc', 981 'system/chromeos/power/power_event_observer_unittest.cc',
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
1466 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1466 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1467 ], 1467 ],
1468 } 1468 }
1469 ], 1469 ],
1470 ], 1470 ],
1471 }, 1471 },
1472 ], 1472 ],
1473 }], 1473 }],
1474 ], 1474 ],
1475 } 1475 }
OLDNEW
« no previous file with comments | « no previous file | ash/aura/wm_shelf_aura.h » ('j') | ash/common/shelf/shelf_locking_manager_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698