Converts mash to use Shell

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/accelerators/ash_focus_manager_factory.h"
@@ skipping 28 matching lines @@
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/wallpaper/wallpaper_controller.h"
 #include "ash/common/wallpaper/wallpaper_delegate.h"
 #include "ash/common/wm/immersive_context_ash.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #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_activation_observer.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 "services/preferences/public/cpp/pref_observer_store.h"
 #include "services/preferences/public/interfaces/preferences.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "ui/app_list/presenter/app_list.h"
 #include "ui/display/display.h"
 #include "ui/views/focus/focus_manager_factory.h"
+#include "ui/wm/public/activation_client.h"
 
 namespace ash {
 
 // static
 WmShell* WmShell::instance_ = nullptr;
 
+WmShell::~WmShell() {
+  session_controller_->RemoveSessionStateObserver(this);
+}
+
 // static
 void WmShell::Set(WmShell* instance) {
   instance_ = instance;
 }
 
 // static
 WmShell* WmShell::Get() {
   return instance_;
 }
 
@@ skipping 23 matching lines @@
         base::MakeUnique<devtools::AshDevToolsCSSAgent>(dom_backend.get());
     auto devtools_client = base::MakeUnique<ui::devtools::UiDevToolsClient>(
         "Ash", devtools_server_.get());
     devtools_client->AddAgent(std::move(dom_backend));
     devtools_client->AddAgent(std::move(css_backend));
     devtools_server_->AttachClient(std::move(devtools_client));
   }
 }
 
 void WmShell::Shutdown() {
+  if (added_activation_observer_)
+    Shell::GetInstance()->activation_client()->RemoveObserver(this);
+
   // These members access WmShell in their destructors.
   wallpaper_controller_.reset();
   accessibility_delegate_.reset();
 
   // ShelfWindowWatcher has window observers and a pointer to the shelf model.
   shelf_window_watcher_.reset();
   // ShelfItemDelegate subclasses it owns have complex cleanup to run (e.g. ARC
   // shelf items in Chrome) so explicitly shutdown early.
   shelf_model()->DestroyItemDelegates();
   // Must be destroyed before FocusClient.
@@ skipping 87 matching lines @@
 void WmShell::NotifyShelfAlignmentChanged(WmWindow* root_window) {
   for (auto& observer : shell_observers_)
     observer.OnShelfAlignmentChanged(root_window);
 }
 
 void WmShell::NotifyShelfAutoHideBehaviorChanged(WmWindow* root_window) {
   for (auto& observer : shell_observers_)
     observer.OnShelfAutoHideBehaviorChanged(root_window);
 }
 
+void WmShell::AddActivationObserver(WmActivationObserver* observer) {
+  if (!added_activation_observer_) {
+    added_activation_observer_ = true;
+    Shell::GetInstance()->activation_client()->AddObserver(this);
+  }
+  activation_observers_.AddObserver(observer);
+}
+
+void WmShell::RemoveActivationObserver(WmActivationObserver* observer) {
+  activation_observers_.RemoveObserver(observer);
+}
+
 void WmShell::AddShellObserver(ShellObserver* observer) {
   shell_observers_.AddObserver(observer);
 }
 
 void WmShell::RemoveShellObserver(ShellObserver* observer) {
   shell_observers_.RemoveObserver(observer);
 }
 
 void WmShell::OnLockStateEvent(LockStateObserver::EventType event) {
   for (auto& observer : lock_state_observers_)
@@ skipping 46 matching lines @@
 
   prefs::mojom::PreferencesManagerPtr pref_manager_ptr;
   // Can be null in tests.
   if (!delegate_->GetShellConnector())
     return;
   delegate_->GetShellConnector()->BindInterface(prefs::mojom::kServiceName,
                                                 &pref_manager_ptr);
   pref_store_ = new preferences::PrefObserverStore(std::move(pref_manager_ptr));
 }
 
-WmShell::~WmShell() {
-  session_controller_->RemoveSessionStateObserver(this);
-}
-
 RootWindowController* WmShell::GetPrimaryRootWindowController() {
   return GetPrimaryRootWindow()->GetRootWindowController();
 }
 
 WmWindow* WmShell::GetRootWindowForNewWindows() {
   if (scoped_root_window_for_new_windows_)
     return scoped_root_window_for_new_windows_;
   return root_window_for_new_windows_;
 }
 
@@ skipping 119 matching lines @@
   accelerator_controller_ = std::move(accelerator_controller);
 }
 
 void WmShell::SessionStateChanged(session_manager::SessionState state) {
   // Create the shelf when a session becomes active. It's safe to do this
   // multiple times (e.g. initial login vs. multiprofile add session).
   if (state == session_manager::SessionState::ACTIVE)
     CreateShelf();
 }
 
+void WmShell::OnWindowActivated(
+    aura::client::ActivationChangeObserver::ActivationReason reason,
+    aura::Window* gained_active,
+    aura::Window* lost_active) {
+  WmWindow* gained_active_wm = WmWindow::Get(gained_active);
+  WmWindow* lost_active_wm = WmWindow::Get(lost_active);
+  if (gained_active_wm)
+    set_root_window_for_new_windows(gained_active_wm->GetRootWindow());
+  for (auto& observer : activation_observers_)
+    observer.OnWindowActivated(gained_active_wm, lost_active_wm);
+}
+
+void WmShell::OnAttemptToReactivateWindow(aura::Window* request_active,
+                                          aura::Window* actual_active) {
+  for (auto& observer : activation_observers_) {
+    observer.OnAttemptToReactivateWindow(WmWindow::Get(request_active),
+                                         WmWindow::Get(actual_active));
+  }
+}
+
 }  // namespace ash