Moves maintaining root_window_for_new_windows_ to 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 42 matching lines @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/sequenced_worker_pool.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 "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);
 }
 
@@ skipping 33 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() {
-  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 162 matching lines @@
     return;
   delegate_->GetShellConnector()->BindInterface(prefs::mojom::kServiceName,
                                                 &pref_factory_ptr);
   pref_store_ = new preferences::PrefClientStore(std::move(pref_factory_ptr));
 }
 
 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_;
-}
-
 bool WmShell::IsForceMaximizeOnFirstRun() {
   return delegate()->IsForceMaximizeOnFirstRun();
 }
 
 bool WmShell::IsSystemModalWindowOpen() {
   if (simulate_modal_window_open_for_testing_)
     return true;
 
   // Traverse all system modal containers, and find its direct child window
   // with "SystemModal" setting, and visible.
@@ skipping 30 matching lines @@
   }
   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(GetRootWindowForNewWindows()->GetDisplayNearestWindow().id());
+  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(
-      GetRootWindowForNewWindows()->GetDisplayNearestWindow().id());
+      Shell::GetWmRootWindowForNewWindows()->GetDisplayNearestWindow().id());
 }
 
 bool WmShell::IsApplistVisible() const {
   return app_list_->IsVisible();
 }
 
 bool WmShell::GetAppListTargetVisibility() const {
   return app_list_->GetTargetVisibility();
 }
 
@@ skipping 52 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)
     CreateShelfView();
 }
 
-void WmShell::OnWindowActivated(
-    aura::client::ActivationChangeObserver::ActivationReason reason,
-    aura::Window* gained_active,
-    aura::Window* lost_active) {
-  // TODO(sky): Shell should implement ActivationChangeObserver, not WmShell.
-  WmWindow* gained_active_wm = WmWindow::Get(gained_active);
-  if (gained_active_wm)
-    set_root_window_for_new_windows(gained_active_wm->GetRootWindow());
-}
-
 }  // namespace ash