ash/ash.gyp - Issue 2046513003: mash: Move shelf model and item classes 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 2046513003: mash: Move shelf model and item classes to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@initshelfearly

Patch Set: 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 80e44743e8a39c7109b76f73818dd00759d65ae4..a134478028ec6778f9884c71ae832e818eee4b43 100644

--- a/ash/ash.gyp

+++ b/ash/ash.gyp

@@ -65,6 +65,14 @@

'common/root_window_controller_common.h',

'common/shelf/shelf_constants.cc',

'common/shelf/shelf_constants.h',

+ 'common/shelf/shelf_item_delegate.h',

+ 'common/shelf/shelf_item_delegate_manager.cc',

+ 'common/shelf/shelf_item_delegate_manager.h',

+ 'common/shelf/shelf_item_types.cc',

+ 'common/shelf/shelf_item_types.h',

+ 'common/shelf/shelf_model.cc',

+ 'common/shelf/shelf_model.h',

+ 'common/shelf/shelf_model_observer.h',

'common/shelf/shelf_types.h',

'common/shelf/wm_shelf.h',

'common/shelf/wm_shelf_observer.h',

@@ -353,20 +361,12 @@

'shelf/shelf_button_pressed_metric_tracker.h',

'shelf/shelf_delegate.h',

'shelf/shelf_icon_observer.h',

- 'shelf/shelf_item_delegate.h',

- 'shelf/shelf_item_delegate_manager.cc',

- 'shelf/shelf_item_delegate_manager.h',

- 'shelf/shelf_item_types.cc',

- 'shelf/shelf_item_types.h',

'shelf/shelf_layout_manager.cc',

'shelf/shelf_layout_manager.h',

'shelf/shelf_layout_manager_observer.h',

'shelf/shelf_locking_manager.cc',

'shelf/shelf_locking_manager.h',

'shelf/shelf_menu_model.h',

- 'shelf/shelf_model.cc',

- 'shelf/shelf_model.h',

- 'shelf/shelf_model_observer.h',

'shelf/shelf_navigator.cc',

'shelf/shelf_navigator.h',

'shelf/shelf_tooltip_manager.cc',

@@ -885,6 +885,7 @@

'app_list/app_list_presenter_delegate_unittest.cc',

'ash_touch_exploration_manager_chromeos_unittest.cc',

'autoclick/autoclick_unittest.cc',

+ 'common/shelf/shelf_model_unittest.cc',

'content/display/screen_orientation_controller_chromeos_unittest.cc',

'content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc',

'content/keyboard_overlay/keyboard_overlay_view_unittest.cc',

@@ -931,7 +932,6 @@

'shelf/shelf_button_pressed_metric_tracker_unittest.cc',

'shelf/shelf_layout_manager_unittest.cc',

'shelf/shelf_locking_manager_unittest.cc',

- 'shelf/shelf_model_unittest.cc',

'shelf/shelf_navigator_unittest.cc',

'shelf/shelf_tooltip_manager_unittest.cc',

'shelf/shelf_unittest.cc',

« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/common/shelf/shelf_item_delegate.h » ('j') | no next file with comments »