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

Unified Diff: ash/ash.gyp

Issue 1890713002: Adds WmWindow and converts WindowState to use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 2 trunk Created 4 years, 8 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
Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 32ec8ec854f91edc53539e579f688957ad8f3778..3e61c61a3b151c8752feef8980d63ae373ddcfe6 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -523,8 +523,18 @@
'wm/ash_focus_rules.h',
'wm/ash_native_cursor_manager.cc',
'wm/ash_native_cursor_manager.h',
+ 'wm/aura/wm_root_window_controller_aura.cc',
+ 'wm/aura/wm_root_window_controller_aura.h',
+ 'wm/aura/wm_window_aura.cc',
+ 'wm/aura/wm_window_aura.h',
'wm/boot_splash_screen_chromeos.cc',
'wm/boot_splash_screen_chromeos.h',
+ 'wm/common/wm_root_window_controller.h',
+ 'wm/common/wm_screen_util.cc',
+ 'wm/common/wm_screen_util.h',
+ 'wm/common/wm_window.h',
+ 'wm/common/wm_window_observer.h',
+ 'wm/common/wm_window_property.h',
'wm/common/workspace/workspace_layout_manager_delegate.h',
'wm/coordinate_conversion.cc',
'wm/coordinate_conversion.h',
@@ -653,6 +663,8 @@
'wm/window_resizer.h',
'wm/window_state.cc',
'wm/window_state.h',
+ 'wm/window_state_aura.cc',
+ 'wm/window_state_aura.h',
'wm/window_state_delegate.cc',
'wm/window_state_delegate.h',
'wm/window_state_observer.h',

Powered by Google App Engine
This is Rietveld 408576698