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

ash/shell/shell_delegate_impl.cc

 // Copyright (c) 2012 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.
 
 #include "ash/shell/shell_delegate_impl.h"
 
 #include "ash/accessibility_delegate.h"
-#include "ash/app_list/app_list_shower_delegate_factory.h"
-#include "ash/app_list/app_list_view_delegate_factory.h"
 #include "ash/default_accessibility_delegate.h"
 #include "ash/default_user_wallpaper_delegate.h"
 #include "ash/gpu_support_stub.h"
 #include "ash/media_delegate.h"
 #include "ash/new_window_delegate.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell/context_menu.h"
 #include "ash/shell/example_factory.h"
 #include "ash/shell/shelf_delegate_impl.h"
 #include "ash/shell/toplevel_window.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/default_system_tray_delegate.h"
 #include "ash/test/test_keyboard_ui.h"
 #include "ash/wm/window_state.h"
-#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/user_manager/user_info_impl.h"
 #include "ui/app_list/app_list_view_delegate.h"
-#include "ui/app_list/shower/app_list_shower_impl.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace ash {
 namespace shell {
 namespace {
 
 class NewWindowDelegateImpl : public NewWindowDelegate {
  public:
@@ skipping 91 matching lines @@
 
  private:
   bool screen_locked_;
 
   // A pseudo user info.
   std::unique_ptr<user_manager::UserInfo> user_info_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateImpl);
 };
 
-class AppListViewDelegateFactoryImpl : public ash::AppListViewDelegateFactory {
- public:
-  AppListViewDelegateFactoryImpl() {}
-  ~AppListViewDelegateFactoryImpl() override {}
-
-  // app_list::AppListViewDelegateFactory:
-  app_list::AppListViewDelegate* GetDelegate() override {
-    if (!app_list_view_delegate_.get())
-      app_list_view_delegate_.reset(CreateAppListViewDelegate());
-    return app_list_view_delegate_.get();
-  }
-
- private:
-  std::unique_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
-
-  DISALLOW_COPY_AND_ASSIGN(AppListViewDelegateFactoryImpl);
-};
-
 }  // namespace
 
-ShellDelegateImpl::ShellDelegateImpl()
-    : shelf_delegate_(nullptr),
-      app_list_shower_delegate_factory_(new AppListShowerDelegateFactory(
-          base::WrapUnique(new AppListViewDelegateFactoryImpl))) {}
+ShellDelegateImpl::ShellDelegateImpl() : shelf_delegate_(nullptr) {}
 
 ShellDelegateImpl::~ShellDelegateImpl() {}
 
 bool ShellDelegateImpl::IsFirstRunAfterBoot() const {
   return false;
 }
 
 bool ShellDelegateImpl::IsIncognitoAllowed() const {
   return true;
 }
@@ skipping 34 matching lines @@
 void ShellDelegateImpl::AddVirtualKeyboardStateObserver(
     VirtualKeyboardStateObserver* observer) {
 }
 
 void ShellDelegateImpl::RemoveVirtualKeyboardStateObserver(
     VirtualKeyboardStateObserver* observer) {
 }
 
 void ShellDelegateImpl::OpenUrl(const GURL& url) {}
 
-app_list::AppListShower* ShellDelegateImpl::GetAppListShower() {
-  if (!app_list_shower_) {
-    app_list_shower_.reset(new app_list::AppListShowerImpl(
-        app_list_shower_delegate_factory_.get()));
-  }
-  return app_list_shower_.get();
+app_list::AppListViewDelegate* ShellDelegateImpl::GetAppListViewDelegate() {
+  if (!app_list_view_delegate_)
+    app_list_view_delegate_.reset(ash::shell::CreateAppListViewDelegate());
+  return app_list_view_delegate_.get();
 }
 
 ShelfDelegate* ShellDelegateImpl::CreateShelfDelegate(ShelfModel* model) {
   shelf_delegate_ = new ShelfDelegateImpl();
   return shelf_delegate_;
 }
 
 ash::SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate() {
   return new DefaultSystemTrayDelegate;
 }
@@ skipping 32 matching lines @@
 base::string16 ShellDelegateImpl::GetProductName() const {
   return base::string16();
 }
 
 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const {
   return gfx::Image();
 }
 
 }  // namespace shell
 }  // namespace ash