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

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

Issue 1866403006: Revert of AppListController refactoring part 3: Switching over to use AppListShower in Ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mus_chrome_delegates_ash_impl
Patch Set: Created 4 years, 8 months 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 ffde548cc0f9930b453a32b9fa74e23155b4d02b..a6c139d187300a68310fd485e8a33510cacfc9ea 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
@@ -11,25 +11,17 @@
#include "chrome/browser/ui/app_list/app_list_service_impl.h"
#include "ui/app_list/app_list_model.h"
-namespace app_list {
-class AppListShower;
-class AppListShowerImpl;
-class AppListShowerDelegateFactory;
-}
+class AppListControllerDelegateAsh;
namespace base {
template <typename T> struct DefaultSingletonTraits;
}
-
-class AppListControllerDelegateAsh;
// AppListServiceAsh wraps functionality in ChromeLauncherController and the Ash
// Shell for showing and hiding the app list on the Ash desktop.
class AppListServiceAsh : public AppListServiceImpl {
public:
static AppListServiceAsh* GetInstance();
-
- app_list::AppListShower* GetAppListShower();
// AppListService overrides:
void Init(Profile* initial_profile) override;
@@ -42,7 +34,6 @@
private:
friend struct base::DefaultSingletonTraits<AppListServiceAsh>;
- friend class AppListServiceAshTestApi;
AppListServiceAsh();
~AppListServiceAsh() override;
@@ -71,9 +62,6 @@
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<AppListControllerDelegateAsh> controller_delegate_;
DISALLOW_COPY_AND_ASSIGN(AppListServiceAsh);
« no previous file with comments | « chrome/browser/ui/ash/app_list/app_list_controller_ash.cc ('k') | chrome/browser/ui/ash/app_list/app_list_service_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698