| Index: ash/test/test_shell_delegate.h
|
| diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
|
| index 63727c034cebafa5cd5bddb5cf98925045b3cfd9..e43cef6be9ad537b43740152eb84f50797e7b431 100644
|
| --- a/ash/test/test_shell_delegate.h
|
| +++ b/ash/test/test_shell_delegate.h
|
| @@ -14,6 +14,11 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| #include "base/observer_list.h"
|
| +
|
| +namespace app_list {
|
| +class AppListShowerDelegateFactory;
|
| +class AppListShowerImpl;
|
| +}
|
|
|
| namespace keyboard {
|
| class KeyboardUI;
|
| @@ -48,7 +53,7 @@
|
| 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;
|
| @@ -64,6 +69,10 @@
|
|
|
| int num_exit_requests() const { return num_exit_requests_; }
|
|
|
| + app_list::AppListShowerImpl* app_list_shower() {
|
| + return app_list_shower_.get();
|
| + }
|
| +
|
| void SetMediaCaptureState(MediaCaptureState state);
|
| void SetForceMaximizeOnFirstRun(bool maximize) {
|
| force_maximize_on_first_run_ = maximize;
|
| @@ -74,7 +83,9 @@
|
| bool multi_profiles_enabled_;
|
| bool force_maximize_on_first_run_;
|
|
|
| - std::unique_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
|
| + std::unique_ptr<app_list::AppListShowerDelegateFactory>
|
| + app_list_shower_delegate_factory_;
|
| + std::unique_ptr<app_list::AppListShowerImpl> app_list_shower_;
|
|
|
| base::ObserverList<ash::VirtualKeyboardStateObserver>
|
| keyboard_state_observer_list_;
|
|
|