ash/shell/shell_delegate_impl.h - 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/shell/shell_delegate_impl.h

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:

Index: ash/shell/shell_delegate_impl.h

diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h

index 74e43143f90f492265d0dd17cf8a2a86ed3b8412..500bef2dc45e630556492613a87f0a3c7f8c43cf 100644

--- a/ash/shell/shell_delegate_impl.h

+++ b/ash/shell/shell_delegate_impl.h

@@ -45,8 +45,7 @@ class ShellDelegateImpl : public ash::ShellDelegate {

CreateKeyboardControllerProxy() OVERRIDE;

virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE;

virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;

- virtual ash::LauncherDelegate* CreateLauncherDelegate(

- ash::LauncherModel* model) OVERRIDE;

+ virtual LauncherDelegate* CreateLauncherDelegate(ShelfModel* model) OVERRIDE;

virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;

virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;

virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;

« no previous file with comments | « ash/shell.cc ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »