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 55349f02d540acc6413e84dd1efdb66bf6371fd8..fb9504ce70b264c9ba0f9da3082e010f95a759ab 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,7 +10,12 @@ |
#include "chrome/browser/ui/app_list/app_list_service_impl.h" |
#include "ui/app_list/app_list_model.h" |
+namespace app_list { |
+class AppListController; |
+} |
+ |
class AppListControllerDelegateAsh; |
+class AppListShowerAsh; |
namespace base { |
template <typename T> struct DefaultSingletonTraits; |
@@ -22,6 +27,8 @@ class AppListServiceAsh : public AppListServiceImpl { |
public: |
static AppListServiceAsh* GetInstance(); |
+ app_list::AppListController* GetAppListController(); |
+ |
// AppListService overrides: |
void Init(Profile* initial_profile) override; |
@@ -37,6 +44,8 @@ class AppListServiceAsh : public AppListServiceImpl { |
AppListServiceAsh(); |
~AppListServiceAsh() override; |
+ void SetViewDelegateForShower(); |
+ |
// Shows the app list if it isn't already showing and Switches to |state|, |
// unless it is |INVALID_STATE| (in which case, opens on the default state). |
void ShowAndSwitchToState(app_list::AppListModel::State state); |
@@ -61,6 +70,7 @@ class AppListServiceAsh : public AppListServiceImpl { |
void CreateForProfile(Profile* default_profile) override; |
void DestroyAppList() override; |
+ scoped_ptr<AppListShowerAsh> app_list_shower_; |
scoped_ptr<AppListControllerDelegateAsh> controller_delegate_; |
DISALLOW_COPY_AND_ASSIGN(AppListServiceAsh); |