Moves app_list() and related functions from Shell to WmShell

ash/shell.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.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 93 matching lines @@
 #include "base/trace_event/trace_event.h"
 #include "chromeos/audio/audio_a11y_controller.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/system/devicemode.h"
 #include "components/ui_devtools/devtools_server.h"
 #include "services/preferences/public/cpp/pref_client_store.h"
 #include "services/preferences/public/interfaces/preferences.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/public/interfaces/constants.mojom.h"
+#include "ui/app_list/presenter/app_list.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/mus/user_activity_forwarder.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/base/user_activity/user_activity_detector.h"
 #include "ui/chromeos/user_activity_power_manager_notifier.h"
 #include "ui/compositor/layer.h"
@@ skipping 287 matching lines @@
 }
 
 void Shell::AddShellObserver(ShellObserver* observer) {
   shell_observers_.AddObserver(observer);
 }
 
 void Shell::RemoveShellObserver(ShellObserver* observer) {
   shell_observers_.RemoveObserver(observer);
 }
 
+void Shell::ShowAppList() {
+  // Show the app list on the default display for new windows.
+  app_list_->Show(
+      GetWmRootWindowForNewWindows()->GetDisplayNearestWindow().id());
+}
+
+void Shell::DismissAppList() {
+  app_list_->Dismiss();
+}
+
+void Shell::ToggleAppList() {
+  // Toggle the app list on the default display for new windows.
+  app_list_->ToggleAppList(
+      GetWmRootWindowForNewWindows()->GetDisplayNearestWindow().id());
+}
+
+bool Shell::IsAppListVisible() const {
+  return app_list_->IsVisible();
+}
+
+bool Shell::GetAppListTargetVisibility() const {
+  return app_list_->GetTargetVisibility();
+}
+
 void Shell::NotifyMaximizeModeStarted() {
   for (auto& observer : shell_observers_)
     observer.OnMaximizeModeStarted();
 }
 
 void Shell::NotifyMaximizeModeEnding() {
   for (auto& observer : shell_observers_)
     observer.OnMaximizeModeEnding();
 }
 
@@ skipping 43 matching lines @@
     observer.OnShelfAutoHideBehaviorChanged(root_window);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, private:
 
 Shell::Shell(std::unique_ptr<ShellDelegate> shell_delegate,
              std::unique_ptr<WmShell> wm_shell)
     : wm_shell_(std::move(wm_shell)),
       shell_delegate_(std::move(shell_delegate)),
+      app_list_(base::MakeUnique<app_list::AppList>()),
       link_handler_model_factory_(nullptr),
       display_configurator_(new display::DisplayConfigurator()),
       native_cursor_manager_(nullptr),
       simulate_modal_window_open_for_testing_(false),
       is_touch_hud_projection_enabled_(false) {
   // TODO(sky): better refactor cash/mash dependencies. Perhaps put all cash
   // state on WmShellAura. http://crbug.com/671246.
 
   if (!wm_shell_->IsRunningInMash()) {
     gpu_support_.reset(shell_delegate_->CreateGPUSupport());
@@ skipping 161 matching lines @@
   display_change_observer_.reset();
   shutdown_observer_.reset();
 
   PowerStatus::Shutdown();
 
   // Ensure that DBusThreadManager outlives this Shell.
   DCHECK(chromeos::DBusThreadManager::IsInitialized());
 
   // Needs to happen right before |instance_| is reset.
   wm_shell_.reset();
+  app_list_.reset();

[msw, 2017/03/14 20:20:05]

nit: probably not needed; it'd be nice to avoid implying that we need some
explicit destruction ordering/timing here (if possible).

[sky, 2017/03/14 21:06:50]

Done.

   wallpaper_delegate_.reset();
   pref_store_ = nullptr;
   shell_delegate_.reset();
 
   DCHECK(instance_ == this);
   instance_ = nullptr;
 }
 
 void Shell::Init(const ShellInitParams& init_params) {
   const bool is_mash = wm_shell_->IsRunningInMash();
@@ skipping 401 matching lines @@
 void Shell::OnWindowActivated(
     aura::client::ActivationChangeObserver::ActivationReason reason,
     aura::Window* gained_active,
     aura::Window* lost_active) {
   WmWindow* gained_active_wm = WmWindow::Get(gained_active);
   if (gained_active_wm)
     root_window_for_new_windows_ = gained_active_wm->GetRootWindow();
 }
 
 }  // namespace ash