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

Unified Diff: ash/ash.gyp

Issue 2025413002: Moves RootWindowControllerCommon and LayoutManager to common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use_root_window_controller_common
Patch Set: merge Created 4 years, 7 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 | « ash/app_list/app_list_presenter_delegate_unittest.cc ('k') | ash/common/root_window_controller_common.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 6ae93a0a7fa5628a7a1be5de8673e23ebec5bf7f..bacbea4bae0cca9d80a25cc55307410f0024b68a 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -49,6 +49,9 @@
'cancel_mode.h',
'cast_config_delegate.cc',
'cast_config_delegate.h',
+ 'common/root_window_controller_common.cc',
+ 'common/root_window_controller_common.h',
+ 'common/shell_window_ids.h',
'common/wm/always_on_top_controller.cc',
'common/wm/always_on_top_controller.h',
'common/wm/background_animator.cc',
@@ -74,6 +77,8 @@
'common/wm/panels/panel_window_resizer.h',
'common/wm/root_window_finder.cc',
'common/wm/root_window_finder.h',
+ 'common/wm/root_window_layout_manager.cc',
+ 'common/wm/root_window_layout_manager.h',
'common/wm/shelf/wm_shelf.h',
'common/wm/shelf/wm_shelf_constants.cc',
'common/wm/shelf/wm_shelf_constants.h',
@@ -296,8 +301,6 @@
'popup_message.h',
'root_window_controller.cc',
'root_window_controller.h',
- 'root_window_controller_common.cc',
- 'root_window_controller_common.h',
'root_window_settings.cc',
'root_window_settings.h',
'rotator/screen_rotation_animation.cc',
@@ -375,7 +378,6 @@
'shell_factory.h',
'shell_init_params.cc',
'shell_init_params.h',
- 'shell_window_ids.h',
'snap_to_pixel_layout_manager.cc',
'snap_to_pixel_layout_manager.h',
'sticky_keys/sticky_keys_controller.cc',
@@ -710,8 +712,6 @@
'wm/resize_shadow.h',
'wm/resize_shadow_controller.cc',
'wm/resize_shadow_controller.h',
- 'wm/root_window_layout_manager.cc',
- 'wm/root_window_layout_manager.h',
'wm/screen_dimmer.cc',
'wm/screen_dimmer.h',
'wm/session_state_animator.cc',
« no previous file with comments | « ash/app_list/app_list_presenter_delegate_unittest.cc ('k') | ash/common/root_window_controller_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698