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

Unified Diff: ash/ash.gyp

Issue 2285703003: Moves WorkspaceEventHandler to ash/common (Closed)
Patch Set: merge 2 trunk Created 4 years, 4 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_shell_aura.h » ('j') | no next file with comments »
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 72516c7c240ff1afbc229bd818dcd343767b8d96..abd777e60898b40d92c54f38c1a8710c03f26c8a 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -518,6 +518,8 @@
'common/wm/workspace/phantom_window_controller.h',
'common/wm/workspace/two_step_edge_cycler.cc',
'common/wm/workspace/two_step_edge_cycler.h',
+ 'common/wm/workspace/workspace_event_handler.cc',
+ 'common/wm/workspace/workspace_event_handler.h',
'common/wm/workspace/workspace_layout_manager.cc',
'common/wm/workspace/workspace_layout_manager.h',
'common/wm/workspace/workspace_layout_manager_backdrop_delegate.h',
@@ -803,8 +805,8 @@
'wm/window_state_aura.h',
'wm/window_util.cc',
'wm/window_util.h',
- 'wm/workspace/workspace_event_handler.cc',
- 'wm/workspace/workspace_event_handler.h',
+ 'wm/workspace/workspace_event_handler_aura.cc',
+ 'wm/workspace/workspace_event_handler_aura.h',
'wm/workspace_controller.cc',
'wm/workspace_controller.h',
],
@@ -980,6 +982,8 @@
'common/system/user/tray_user_unittest.cc',
'common/wm/container_finder_unittest.cc',
'common/wm/overview/cleanup_animation_observer_unittest.cc',
+ 'common/wm/workspace/workspace_event_handler_test_helper.cc',
+ 'common/wm/workspace/workspace_event_handler_test_helper.h',
'content/display/screen_orientation_controller_chromeos_unittest.cc',
'content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc',
'content/keyboard_overlay/keyboard_overlay_view_unittest.cc',
@@ -1077,8 +1081,6 @@
'wm/window_util_unittest.cc',
'wm/workspace/magnetism_matcher_unittest.cc',
'wm/workspace/multi_window_resize_controller_unittest.cc',
- 'wm/workspace/workspace_event_handler_test_helper.cc',
- 'wm/workspace/workspace_event_handler_test_helper.h',
'wm/workspace/workspace_event_handler_unittest.cc',
'wm/workspace/workspace_layout_manager_unittest.cc',
'wm/workspace/workspace_window_resizer_unittest.cc',
« no previous file with comments | « no previous file | ash/aura/wm_shell_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698