Index: ash/test/test_shell_delegate.h |
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h |
index e43cef6be9ad537b43740152eb84f50797e7b431..2c3a6333c00e2fa7584a6dbbcdf5eeea96864dfe 100644 |
--- a/ash/test/test_shell_delegate.h |
+++ b/ash/test/test_shell_delegate.h |
@@ -16,8 +16,8 @@ |
#include "base/observer_list.h" |
namespace app_list { |
-class AppListShowerDelegateFactory; |
-class AppListShowerImpl; |
+class AppListPresenterDelegateFactory; |
+class AppListPresenterImpl; |
} |
namespace keyboard { |
@@ -53,7 +53,7 @@ class TestShellDelegate : public ShellDelegate { |
void RemoveVirtualKeyboardStateObserver( |
VirtualKeyboardStateObserver* observer) override; |
void OpenUrl(const GURL& url) override; |
- app_list::AppListShower* GetAppListShower() override; |
+ app_list::AppListPresenter* GetAppListPresenter() override; |
ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; |
SystemTrayDelegate* CreateSystemTrayDelegate() override; |
UserWallpaperDelegate* CreateUserWallpaperDelegate() override; |
@@ -69,8 +69,8 @@ class TestShellDelegate : public ShellDelegate { |
int num_exit_requests() const { return num_exit_requests_; } |
- app_list::AppListShowerImpl* app_list_shower() { |
- return app_list_shower_.get(); |
+ app_list::AppListPresenterImpl* app_list_presenter() { |
+ return app_list_presenter_.get(); |
} |
void SetMediaCaptureState(MediaCaptureState state); |
@@ -83,9 +83,9 @@ class TestShellDelegate : public ShellDelegate { |
bool multi_profiles_enabled_; |
bool force_maximize_on_first_run_; |
- std::unique_ptr<app_list::AppListShowerDelegateFactory> |
- app_list_shower_delegate_factory_; |
- std::unique_ptr<app_list::AppListShowerImpl> app_list_shower_; |
+ std::unique_ptr<app_list::AppListPresenterDelegateFactory> |
+ app_list_presenter_delegate_factory_; |
+ std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_; |
base::ObserverList<ash::VirtualKeyboardStateObserver> |
keyboard_state_observer_list_; |