Index: chrome/browser/ui/ash/app_list/app_list_service_ash.cc |
diff --git a/chrome/browser/ui/ash/app_list/app_list_service_ash.cc b/chrome/browser/ui/ash/app_list/app_list_service_ash.cc |
index ca2480e08fe6584d502b615360372e1670964046..18d7c51150f7395823973f49cc93377615bedd23 100644 |
--- a/chrome/browser/ui/ash/app_list/app_list_service_ash.cc |
+++ b/chrome/browser/ui/ash/app_list/app_list_service_ash.cc |
@@ -16,6 +16,7 @@ |
#include "chrome/browser/ui/app_list/start_page_service.h" |
#include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h" |
#include "chrome/browser/ui/ash/app_list/app_list_presenter_delegate_mus.h" |
+#include "chrome/browser/ui/ash/app_list/app_list_presenter_service.h" |
#include "chrome/browser/ui/ash/ash_util.h" |
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
#include "chrome/browser/ui/ash/session_util.h" |
@@ -58,7 +59,7 @@ class AppListPresenterDelegateFactoryMus |
~AppListPresenterDelegateFactoryMus() override {} |
std::unique_ptr<app_list::AppListPresenterDelegate> GetDelegate( |
- app_list::AppListPresenter* presenter) override { |
+ app_list::AppListPresenterImpl* presenter) override { |
return base::MakeUnique<AppListPresenterDelegateMus>( |
presenter, view_delegate_factory_.get()); |
} |
@@ -85,20 +86,21 @@ AppListServiceAsh::AppListServiceAsh() { |
presenter_delegate_factory_.reset(new ash::AppListPresenterDelegateFactory( |
base::MakeUnique<ViewDelegateFactoryImpl>(this))); |
} |
- app_list_presenter_.reset( |
- new app_list::AppListPresenterImpl(presenter_delegate_factory_.get())); |
- controller_delegate_.reset( |
- new AppListControllerDelegateAsh(app_list_presenter_.get())); |
+ app_list_presenter_ = base::MakeUnique<app_list::AppListPresenterImpl>( |
+ presenter_delegate_factory_.get()); |
+ controller_delegate_ = |
+ base::MakeUnique<AppListControllerDelegateAsh>(app_list_presenter_.get()); |
} |
-AppListServiceAsh::~AppListServiceAsh() { |
-} |
+AppListServiceAsh::~AppListServiceAsh() {} |
-app_list::AppListPresenter* AppListServiceAsh::GetAppListPresenter() { |
+app_list::AppListPresenterImpl* AppListServiceAsh::GetAppListPresenter() { |
return app_list_presenter_.get(); |
} |
void AppListServiceAsh::Init(Profile* initial_profile) { |
+ app_list_presenter_service_ = base::MakeUnique<AppListPresenterService>(); |
+ |
// Ensure the StartPageService is created here. This early initialization is |
// necessary to allow the WebContents to load before the app list is shown. |
app_list::StartPageService* service = |