| 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 ba2bcbbf3e6e24b9106165abcf1a4610d439c20a..f2da9c3c28f11628dadbba8e00bd21b364e0f4a5 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
|
| @@ -10,18 +10,26 @@
|
| #include "chrome/browser/ui/app_list/app_list_service_impl.h"
|
| #include "ui/app_list/app_list_model.h"
|
|
|
| -class AppListControllerDelegateAsh;
|
| +namespace app_list {
|
| +class AppListShower;
|
| +class AppListShowerImpl;
|
| +class AppListShowerDelegateFactory;
|
| +}
|
|
|
| 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;
|
|
|
| @@ -33,6 +41,7 @@ class AppListServiceAsh : public AppListServiceImpl {
|
|
|
| private:
|
| friend struct base::DefaultSingletonTraits<AppListServiceAsh>;
|
| + friend class AppListServiceAshTestApi;
|
|
|
| AppListServiceAsh();
|
| ~AppListServiceAsh() override;
|
| @@ -61,6 +70,8 @@ class AppListServiceAsh : public AppListServiceImpl {
|
| void CreateForProfile(Profile* default_profile) override;
|
| void DestroyAppList() override;
|
|
|
| + scoped_ptr<app_list::AppListShowerDelegateFactory> shower_delegate_factory_;
|
| + scoped_ptr<app_list::AppListShowerImpl> app_list_shower_;
|
| scoped_ptr<AppListControllerDelegateAsh> controller_delegate_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AppListServiceAsh);
|
|
|