Index: chrome/browser/ui/ash/app_list/app_list_service_ash.h |
diff --git a/chrome/browser/ui/ash/app_list/app_list_service_ash.h b/chrome/browser/ui/ash/app_list/app_list_service_ash.h |
index ffde548cc0f9930b453a32b9fa74e23155b4d02b..02dcf008393a2d196f448f94367f8c34c7531920 100644 |
--- a/chrome/browser/ui/ash/app_list/app_list_service_ash.h |
+++ b/chrome/browser/ui/ash/app_list/app_list_service_ash.h |
@@ -12,9 +12,9 @@ |
#include "ui/app_list/app_list_model.h" |
namespace app_list { |
-class AppListShower; |
-class AppListShowerImpl; |
-class AppListShowerDelegateFactory; |
+class AppListPresenter; |
+class AppListPresenterImpl; |
+class AppListPresenterDelegateFactory; |
} |
namespace base { |
@@ -29,7 +29,7 @@ class AppListServiceAsh : public AppListServiceImpl { |
public: |
static AppListServiceAsh* GetInstance(); |
- app_list::AppListShower* GetAppListShower(); |
+ app_list::AppListPresenter* GetAppListPresenter(); |
// AppListService overrides: |
void Init(Profile* initial_profile) override; |
@@ -71,9 +71,9 @@ class AppListServiceAsh : public AppListServiceImpl { |
void CreateForProfile(Profile* default_profile) override; |
void DestroyAppList() override; |
- std::unique_ptr<app_list::AppListShowerDelegateFactory> |
- shower_delegate_factory_; |
- std::unique_ptr<app_list::AppListShowerImpl> app_list_shower_; |
+ std::unique_ptr<app_list::AppListPresenterDelegateFactory> |
+ presenter_delegate_factory_; |
+ std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_; |
std::unique_ptr<AppListControllerDelegateAsh> controller_delegate_; |
DISALLOW_COPY_AND_ASSIGN(AppListServiceAsh); |