ash/ash.gyp - Issue 1921353002: Moves handful of files to ash/wm/common

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 1921353002: Moves handful of files to ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shell_ids

Patch Set: merge to 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 5f7e95345ea4e8d54d069d61e609f2e13ac8f2d7..fd1fd90778fb771a8ffa6576de4a1ea0e9eef908 100644

--- a/ash/ash.gyp

+++ b/ash/ash.gyp

@@ -216,8 +216,6 @@

'shelf/app_list_button.h',

'shelf/app_list_shelf_item_delegate.cc',

'shelf/app_list_shelf_item_delegate.h',

- 'shelf/background_animator.cc',

- 'shelf/background_animator.h',

'shelf/overflow_bubble.cc',

'shelf/overflow_bubble.h',

'shelf/overflow_bubble_view.cc',

@@ -537,6 +535,15 @@

'wm/aura/wm_window_aura.h',

'wm/boot_splash_screen_chromeos.cc',

'wm/boot_splash_screen_chromeos.h',

+ 'wm/common/background_animator.cc',

+ 'wm/common/background_animator.h',

+ 'wm/common/default_state.cc',

+ 'wm/common/default_state.h',

+ 'wm/common/dock/docked_window_layout_manager.cc',

+ 'wm/common/dock/docked_window_layout_manager.h',

+ 'wm/common/dock/docked_window_layout_manager_observer.h',

+ 'wm/common/drag_details.cc',

+ 'wm/common/drag_details.h',

'wm/common/root_window_finder.cc',

'wm/common/root_window_finder.h',

'wm/common/shelf/wm_shelf.h',

@@ -549,6 +556,13 @@

'wm/common/window_parenting_utils.h',

'wm/common/window_positioning_utils.cc',

'wm/common/window_positioning_utils.h',

+ 'wm/common/window_resizer.cc',

+ 'wm/common/window_resizer.h',

+ 'wm/common/window_state.cc',

+ 'wm/common/window_state.h',

+ 'wm/common/window_state_delegate.cc',

+ 'wm/common/window_state_delegate.h',

+ 'wm/common/window_state_observer.h',

'wm/common/window_state_util.cc',

'wm/common/window_state_util.h',

'wm/common/wm_activation_observer.h',

@@ -574,19 +588,12 @@

'wm/common/workspace/workspace_types.h',

'wm/cursor_manager_chromeos.cc',

'wm/cursor_manager_chromeos.h',

- 'wm/default_state.cc',

- 'wm/default_state.h',

'wm/default_window_resizer.cc',

'wm/default_window_resizer.h',

'wm/dim_window.cc',

'wm/dim_window.h',

- 'wm/dock/docked_window_layout_manager.cc',

- 'wm/dock/docked_window_layout_manager.h',

- 'wm/dock/docked_window_layout_manager_observer.h',

'wm/dock/docked_window_resizer.cc',

'wm/dock/docked_window_resizer.h',

- 'wm/drag_details.cc',

- 'wm/drag_details.h',

'wm/drag_window_controller.cc',

'wm/drag_window_controller.h',

'wm/drag_window_resizer.cc',

@@ -691,15 +698,8 @@

'wm/window_positioner.h',

'wm/window_properties.cc',

'wm/window_properties.h',

- 'wm/window_resizer.cc',

- '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',

'wm/window_util.cc',

'wm/window_util.h',

'wm/workspace/magnetism_matcher.cc',

« no previous file with comments | « ash/accelerators/accelerator_interactive_uitest_chromeos.cc ('k') | ash/display/display_manager_unittest.cc » ('j') | no next file with comments »