Moves app_list() and related functions from Shell to WmShell

ash/common/wm_shell.cc

 // Copyright 2016 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/common/wm_shell.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/cast_config_controller.h"
@@ skipping 27 matching lines @@
 #include "ash/common/wm/root_window_finder.h"
 #include "ash/common/wm/system_modal_container_layout_manager.h"
 #include "ash/common/wm/window_cycle_controller.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
-#include "ui/app_list/presenter/app_list.h"
 #include "ui/display/display.h"
 
 namespace ash {
 
 // static
 WmShell* WmShell::instance_ = nullptr;
 
 WmShell::~WmShell() {
   DCHECK_EQ(this, instance_);
   instance_ = nullptr;
@@ skipping 78 matching lines @@
 void WmShell::RemoveLockStateObserver(LockStateObserver* observer) {
   lock_state_observers_.RemoveObserver(observer);
 }
 
 void WmShell::SetShelfDelegateForTesting(
     std::unique_ptr<ShelfDelegate> test_delegate) {
   shelf_delegate_ = std::move(test_delegate);
 }
 
 WmShell::WmShell()
-    : app_list_(base::MakeUnique<app_list::AppList>()),
-      brightness_control_delegate_(
+    : brightness_control_delegate_(
           base::MakeUnique<system::BrightnessControllerChromeos>()),
       cast_config_(base::MakeUnique<CastConfigController>()),
       focus_cycler_(base::MakeUnique<FocusCycler>()),
       immersive_context_(base::MakeUnique<ImmersiveContextAsh>()),
       keyboard_brightness_control_delegate_(
           base::MakeUnique<KeyboardBrightnessController>()),
       locale_notification_controller_(
           base::MakeUnique<LocaleNotificationController>()),
       media_controller_(base::MakeUnique<MediaController>()),
       new_window_controller_(base::MakeUnique<NewWindowController>()),
       session_controller_(base::MakeUnique<SessionController>()),
       shelf_controller_(base::MakeUnique<ShelfController>()),
       shutdown_controller_(base::MakeUnique<ShutdownController>()),
       system_tray_controller_(base::MakeUnique<SystemTrayController>()),
       system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()),
       vpn_list_(base::MakeUnique<VpnList>()),
       window_cycle_controller_(base::MakeUnique<WindowCycleController>()),
       window_selector_controller_(
           base::MakeUnique<WindowSelectorController>()) {
   DCHECK(!instance_);
   instance_ = this;
   session_controller_->AddSessionStateObserver(this);
-
 }
 
 RootWindowController* WmShell::GetPrimaryRootWindowController() {
   return GetPrimaryRootWindow()->GetRootWindowController();
 }
 
 bool WmShell::IsForceMaximizeOnFirstRun() {
   return Shell::Get()->shell_delegate()->IsForceMaximizeOnFirstRun();
 }
 
@@ skipping 34 matching lines @@
       return;
     }
   }
   for (WmWindow* root_window : root_windows) {
     root_window->GetRootWindowController()
         ->GetSystemModalLayoutManager(removed)
         ->DestroyModalBackground();
   }
 }
 
-void WmShell::ShowAppList() {
-  // Show the app list on the default display for new windows.
-  app_list_->Show(
-      Shell::GetWmRootWindowForNewWindows()->GetDisplayNearestWindow().id());
-}
-
-void WmShell::DismissAppList() {
-  app_list_->Dismiss();
-}
-
-void WmShell::ToggleAppList() {
-  // Toggle the app list on the default display for new windows.
-  app_list_->ToggleAppList(
-      Shell::GetWmRootWindowForNewWindows()->GetDisplayNearestWindow().id());
-}
-
-bool WmShell::IsApplistVisible() const {
-  return app_list_->IsVisible();
-}
-
-bool WmShell::GetAppListTargetVisibility() const {
-  return app_list_->GetTargetVisibility();
-}
-
 void WmShell::SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui) {
   keyboard_ui_ = std::move(keyboard_ui);
 }
 
 void WmShell::SetSystemTrayDelegate(
     std::unique_ptr<SystemTrayDelegate> delegate) {
   DCHECK(delegate);
   system_tray_delegate_ = std::move(delegate);
   system_tray_delegate_->Initialize();
   // Accesses WmShell in its constructor.
@@ skipping 46 matching lines @@
 
   // Only trigger an update in mash because with classic ash chrome calls
   // UpdateAfterLoginStatusChange() directly.
   if (IsRunningInMash()) {
     // TODO(jamescook): Should this call Shell::OnLoginStatusChanged() too?
     UpdateAfterLoginStatusChange(session_controller_->GetLoginStatus());
   }
 }
 
 }  // namespace ash