AppListController refactoring part 3: Switching over to use AppListShower in Ash.

chrome/browser/ui/ash/app_list/app_list_service_ash.h

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..ffde548cc0f9930b453a32b9fa74e23155b4d02b 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
@@ -5,23 +5,32 @@
 #ifndef CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_SERVICE_ASH_H_
 #define CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_SERVICE_ASH_H_
 
+#include <memory>
+
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #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 +42,7 @@ class AppListServiceAsh : public AppListServiceImpl {
 
  private:
   friend struct base::DefaultSingletonTraits<AppListServiceAsh>;
+  friend class AppListServiceAshTestApi;
 
   AppListServiceAsh();
   ~AppListServiceAsh() override;
@@ -61,7 +71,10 @@ class AppListServiceAsh : public AppListServiceImpl {
   void CreateForProfile(Profile* default_profile) override;
   void DestroyAppList() override;
 
-  scoped_ptr<AppListControllerDelegateAsh> controller_delegate_;
+  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);
 };