| Index: ash/test/test_shell_delegate.h
|
| diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
|
| index 790163c5f9c3b60e188c5b4ecd1eb45f12ca70de..3edd95cc2cb52e94efb0e3a245d9a97a073131de 100644
|
| --- a/ash/test/test_shell_delegate.h
|
| +++ b/ash/test/test_shell_delegate.h
|
| @@ -41,8 +41,7 @@ class TestShellDelegate : public ShellDelegate {
|
| CreateKeyboardControllerProxy() OVERRIDE;
|
| virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE;
|
| virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
|
| - virtual LauncherDelegate* CreateLauncherDelegate(
|
| - ash::LauncherModel* model) OVERRIDE;
|
| + virtual LauncherDelegate* CreateLauncherDelegate(ShelfModel* model) OVERRIDE;
|
| virtual SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;
|
| virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
|
| virtual CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;
|
|
|