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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/aura/wm_shelf_aura.h » ('j') | ash/common/shelf/shelf_locking_manager_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index a812c1fa0eee890cc15b549179c5ed1b3ba08e65..091b7bffddbda8f5c8927e96befb598ac44f2297 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -109,6 +109,8 @@
'common/shelf/shelf_item_delegate_manager.h',
'common/shelf/shelf_item_types.cc',
'common/shelf/shelf_item_types.h',
+ 'common/shelf/shelf_locking_manager.cc',
+ 'common/shelf/shelf_locking_manager.h',
'common/shelf/shelf_menu_model.h',
'common/shelf/shelf_model.cc',
'common/shelf/shelf_model.h',
@@ -356,6 +358,7 @@
'common/wm/forwarding_layer_delegate.h',
'common/wm/fullscreen_window_finder.cc',
'common/wm/fullscreen_window_finder.h',
+ 'common/wm/lock_state_observer.h',
'common/wm/maximize_mode/maximize_mode_controller.cc',
'common/wm/maximize_mode/maximize_mode_controller.h',
'common/wm/maximize_mode/maximize_mode_event_handler.cc',
@@ -618,8 +621,6 @@
'shelf/shelf_layout_manager.cc',
'shelf/shelf_layout_manager.h',
'shelf/shelf_layout_manager_observer.h',
- 'shelf/shelf_locking_manager.cc',
- 'shelf/shelf_locking_manager.h',
'shelf/shelf_navigator.cc',
'shelf/shelf_navigator.h',
'shelf/shelf_tooltip_manager.cc',
@@ -698,7 +699,6 @@
'wm/lock_layout_manager.h',
'wm/lock_state_controller.cc',
'wm/lock_state_controller.h',
- 'wm/lock_state_observer.h',
'wm/lock_window_state.cc',
'wm/lock_window_state.h',
'wm/maximize_mode/maximize_mode_event_handler_aura.cc',
@@ -908,6 +908,7 @@
'common/display/display_info_unittest.cc',
'common/material_design/material_design_controller_unittest.cc',
'common/popup_message_unittest.cc',
+ 'common/shelf/shelf_locking_manager_unittest.cc',
'common/shelf/shelf_model_unittest.cc',
'common/system/chromeos/brightness/tray_brightness_unittest.cc',
'common/system/chromeos/ime_menu/ime_menu_tray_unittest.cc',
@@ -968,7 +969,6 @@
'shelf/scoped_observer_with_duplicated_sources_unittest.cc',
'shelf/shelf_button_pressed_metric_tracker_unittest.cc',
'shelf/shelf_layout_manager_unittest.cc',
- 'shelf/shelf_locking_manager_unittest.cc',
'shelf/shelf_navigator_unittest.cc',
'shelf/shelf_tooltip_manager_unittest.cc',
'shelf/shelf_unittest.cc',
« 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