diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 19:48:36 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 19:48:36 +0000 |
| commit | 64936bfc5e259b97286498932cd4abe1ad4d3c57 (patch) | |
| tree | 977b1c6e7c9b2af1b63dbe46312ba9b6603b0894 /ash/shell/shell_delegate_impl.h | |
| parent | 04afd69e36366fa5cdc3b8c03720119d755c5580 (diff) | |
| download | chromium_src-64936bfc5e259b97286498932cd4abe1ad4d3c57.zip chromium_src-64936bfc5e259b97286498932cd4abe1ad4d3c57.tar.gz chromium_src-64936bfc5e259b97286498932cd4abe1ad4d3c57.tar.bz2 | |
ash: Rename LauncherModel to ShelfModel.
* Move launcher_model.* from launcher/ to shelf/
* Rename to shelf_model.*
BUG=248353
TEST=None, no functional changes
R=jamescook@chromium.org,harrym@chromium.org
Review URL: https://codereview.chromium.org/71653003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235217 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/shell_delegate_impl.h')
| -rw-r--r-- | ash/shell/shell_delegate_impl.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h index 74e4314..500bef2 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; |