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

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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 "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;
 
   // ProfileAttributesStorage::Observer overrides:
   // On ChromeOS this should never happen. On other platforms, there is always a
   // Non-ash AppListService that is responsible for handling this.
   // TODO(calamity): Ash shouldn't observe the ProfileAttributesStorage at all.
   void OnProfileWillBeRemoved(const base::FilePath& profile_path) override;
 
  private:
   friend struct base::DefaultSingletonTraits<AppListServiceAsh>;
-  friend class AppListServiceAshTestApi;
 
   AppListServiceAsh();
   ~AppListServiceAsh() override;
 
   // 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);
 
   // AppListService overrides:
   base::FilePath GetProfilePath(const base::FilePath& user_data_dir) override;
   void ShowForProfile(Profile* default_profile) override;
   void ShowForAppInstall(Profile* profile,
                          const std::string& extension_id,
                          bool start_discovery_tracking) override;
   void ShowForCustomLauncherPage(Profile* profile) override;
   void HideCustomLauncherPage() override;
   bool IsAppListVisible() const override;
   void DismissAppList() override;
   void EnableAppList(Profile* initial_profile,
                      AppListEnableSource enable_source) override;
   gfx::NativeWindow GetAppListWindow() override;
   Profile* GetCurrentAppListProfile() override;
   AppListControllerDelegate* GetControllerDelegate() override;
 
   // ApplistServiceImpl overrides:
   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);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_SERVICE_ASH_H_