| Index: ash/test/test_shell_delegate.h
|
| diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
|
| index c27879dd3be8ca2af081a8dc37fe8bbac0e8a84b..2d50804a515def368ee01d527f4d929148d8a811 100644
|
| --- a/ash/test/test_shell_delegate.h
|
| +++ b/ash/test/test_shell_delegate.h
|
| @@ -15,6 +15,11 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/observer_list.h"
|
|
|
| +namespace app_list {
|
| +class AppListShowerDelegateFactory;
|
| +class AppListShowerImpl;
|
| +}
|
| +
|
| namespace keyboard {
|
| class KeyboardUI;
|
| }
|
| @@ -31,6 +36,10 @@ class TestShellDelegate : public ShellDelegate {
|
| multi_profiles_enabled_ = multi_profiles_enabled;
|
| }
|
|
|
| + app_list::AppListShowerImpl* app_list_shower() {
|
| + return app_list_shower_.get();
|
| + }
|
| +
|
| // Overridden from ShellDelegate:
|
| bool IsFirstRunAfterBoot() const override;
|
| bool IsIncognitoAllowed() const override;
|
| @@ -48,7 +57,7 @@ class TestShellDelegate : public ShellDelegate {
|
| void RemoveVirtualKeyboardStateObserver(
|
| VirtualKeyboardStateObserver* observer) override;
|
| void OpenUrl(const GURL& url) override;
|
| - app_list::AppListViewDelegate* GetAppListViewDelegate() override;
|
| + app_list::AppListShower* GetAppListShower() override;
|
| ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
|
| SystemTrayDelegate* CreateSystemTrayDelegate() override;
|
| UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
|
| @@ -74,7 +83,9 @@ class TestShellDelegate : public ShellDelegate {
|
| bool multi_profiles_enabled_;
|
| bool force_maximize_on_first_run_;
|
|
|
| - scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
|
| + scoped_ptr<app_list::AppListShowerDelegateFactory>
|
| + app_list_shower_delegate_factory_;
|
| + scoped_ptr<app_list::AppListShowerImpl> app_list_shower_;
|
|
|
| base::ObserverList<ash::VirtualKeyboardStateObserver>
|
| keyboard_state_observer_list_;
|
|
|