Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1070)

Unified Diff: chrome/browser/ui/ash/app_list/app_list_service_ash.h

Issue 2576913002: Use mojo app list interfaces for mash and classic ash. (Closed)
Patch Set: Fix test name. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 b3f3763e61dbde6c9d374314d191b0d2157bb45f..8234216020ae08cbb9cd5ad45930009f3af27273 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
@@ -9,11 +9,11 @@
#include "base/macros.h"
#include "chrome/browser/ui/app_list/app_list_service_impl.h"
-#include "chrome/browser/ui/ash/app_list/app_list_presenter_service.h"
#include "ui/app_list/app_list_model.h"
+class AppListPresenterService;
+
namespace app_list {
-class AppListPresenter;
class AppListPresenterImpl;
class AppListPresenterDelegateFactory;
}
@@ -30,7 +30,7 @@ class AppListServiceAsh : public AppListServiceImpl {
public:
static AppListServiceAsh* GetInstance();
- app_list::AppListPresenter* GetAppListPresenter();
+ app_list::AppListPresenterImpl* GetAppListPresenter();
// AppListService overrides:
void Init(Profile* initial_profile) override;
@@ -76,8 +76,7 @@ class AppListServiceAsh : public AppListServiceImpl {
presenter_delegate_factory_;
std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_;
std::unique_ptr<AppListControllerDelegateAsh> controller_delegate_;
-
- AppListPresenterService app_list_presenter_service_;
+ std::unique_ptr<AppListPresenterService> app_list_presenter_service_;
DISALLOW_COPY_AND_ASSIGN(AppListServiceAsh);
};

Powered by Google App Engine
This is Rietveld 408576698