ash/ash.gyp - Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf

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 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: gyp Created 4 years, 6 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 bacbea4bae0cca9d80a25cc55307410f0024b68a..62697d0a81f2610f1a82406e26cf8de44b735fbc 100644

--- a/ash/ash.gyp

+++ b/ash/ash.gyp

@@ -51,6 +51,13 @@

'cast_config_delegate.h',

'common/root_window_controller_common.cc',

'common/root_window_controller_common.h',

+ 'common/shelf/shelf_constants.cc',

+ 'common/shelf/shelf_constants.h',

+ 'common/shelf/shelf_types.h',

+ 'common/shelf/wm_shelf.h',

+ 'common/shelf/wm_shelf_observer.h',

+ 'common/shelf/wm_shelf_util.cc',

+ 'common/shelf/wm_shelf_util.h',

'common/shell_window_ids.h',

'common/wm/always_on_top_controller.cc',

'common/wm/always_on_top_controller.h',

@@ -79,13 +86,7 @@

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

- 'common/wm/shelf/wm_shelf_observer.h',

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

James Cook 2016/06/03 19:40:57 I'll do this one in a follow-up patch. Doing it in

- 'common/wm/shelf/wm_shelf_util.cc',

- 'common/wm/shelf/wm_shelf_util.h',

'common/wm/switchable_windows.cc',

'common/wm/switchable_windows.h',

'common/wm/window_animation_types.h',

@@ -339,8 +340,6 @@

'shelf/shelf_button.h',

'shelf/shelf_button_pressed_metric_tracker.cc',

'shelf/shelf_button_pressed_metric_tracker.h',

- 'shelf/shelf_constants.cc',

- 'shelf/shelf_constants.h',

'shelf/shelf_delegate.h',

'shelf/shelf_icon_observer.h',

'shelf/shelf_item_delegate.h',

@@ -361,7 +360,6 @@

'shelf/shelf_navigator.h',

'shelf/shelf_tooltip_manager.cc',

'shelf/shelf_tooltip_manager.h',

- 'shelf/shelf_types.h',

'shelf/shelf_util.cc',

'shelf/shelf_util.h',

'shelf/shelf_view.cc',

« no previous file with comments | « ash/app_list/app_list_presenter_delegate.cc ('k') | ash/common/shelf/shelf_constants.h » ('j') | ash/common/shelf/wm_shelf_util.cc » ('J')