| Index: ash/test/test_shell_delegate.h
|
| diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
|
| index 01416170044a9a0a6a170ef2de356adb6f35deb8..4cb369d34727445267797be7b5f6e653dd6bbc55 100644
|
| --- a/ash/test/test_shell_delegate.h
|
| +++ b/ash/test/test_shell_delegate.h
|
| @@ -48,7 +48,7 @@ class TestShellDelegate : public ShellDelegate {
|
| virtual void RemoveVirtualKeyboardStateObserver(
|
| VirtualKeyboardStateObserver* observer) OVERRIDE;
|
| virtual content::BrowserContext* GetActiveBrowserContext() OVERRIDE;
|
| - virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
|
| + virtual app_list::AppListViewDelegate* GetAppListViewDelegate() OVERRIDE;
|
| virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) OVERRIDE;
|
| virtual SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;
|
| virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
|
| @@ -76,6 +76,7 @@ class TestShellDelegate : public ShellDelegate {
|
| bool multi_profiles_enabled_;
|
|
|
| scoped_ptr<content::BrowserContext> active_browser_context_;
|
| + scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
|
|
|
| ObserverList<ash::VirtualKeyboardStateObserver> keyboard_state_observer_list_;
|
|
|
|
|