ash/ash.gyp - Issue 1890713002: Adds WmWindow and converts WindowState to use it

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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 again 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:

Index: ash/ash.gyp

diff --git a/ash/ash.gyp b/ash/ash.gyp

index 99c141b584b5411900ff1fd4a50dd98c4bb6963d..c95b02fee49837c4b36a6580075e87c4991893ee 100644

--- a/ash/ash.gyp

+++ b/ash/ash.gyp

@@ -523,10 +523,20 @@

'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_event.cc',

'wm/common/wm_event.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',

@@ -655,6 +665,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',