ash/ash.gyp - Issue 71653003: ash: Rename LauncherModel to ShelfModel.

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 71653003: ash: Rename LauncherModel to ShelfModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: chrome changes Created 7 years, 1 month 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 388b8222f4481906e08bfa1e1b8c9ce5a259d826..4c3d7a27358c8a17e451d575510bc7eec08ce2aa 100644

--- a/ash/ash.gyp

+++ b/ash/ash.gyp

@@ -164,8 +164,6 @@

'launcher/launcher_item_delegate_manager.cc',

'launcher/launcher_item_delegate_manager.h',

'launcher/launcher_item_delegate.h',

- 'launcher/launcher_model.cc',

- 'launcher/launcher_model.h',

'launcher/launcher_types.cc',

'launcher/launcher_types.h',

'magnifier/magnification_controller.cc',

@@ -214,6 +212,8 @@

'shelf/shelf_layout_manager.cc',

'shelf/shelf_layout_manager.h',

'shelf/shelf_layout_manager_observer.h',

+ 'shelf/shelf_model.cc',

+ 'shelf/shelf_model.h',

'shelf/shelf_model_observer.h',

'shelf/shelf_model_util.cc',

'shelf/shelf_model_util.h',

@@ -760,7 +760,6 @@

'focus_cycler_unittest.cc',

'keyboard_overlay/keyboard_overlay_delegate_unittest.cc',

'keyboard_overlay/keyboard_overlay_view_unittest.cc',

- 'launcher/launcher_model_unittest.cc',

'launcher/launcher_unittest.cc',

'magnifier/magnification_controller_unittest.cc',

'root_window_controller_unittest.cc',

@@ -770,6 +769,7 @@

'session_state_delegate_stub.h',

'shelf/scoped_observer_with_duplicated_sources_unittest.cc',

'shelf/shelf_layout_manager_unittest.cc',

+ 'shelf/shelf_model_unittest.cc',

'shelf/shelf_navigator_unittest.cc',

'shelf/shelf_tooltip_manager_unittest.cc',

'shelf/shelf_view_unittest.cc',

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