mash: remove more shell/shelf WmWindow usage.

ash/mus/window_manager.cc

 // Copyright 2015 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/mus/window_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 154 matching lines @@
   lost_connection_callback_ = std::move(closure);
 }
 
 bool WindowManager::WaitForInitialDisplays() {
   return window_manager_client_->WaitForInitialDisplays();
 }
 
 void WindowManager::DeleteAllRootWindowControllers() {
   // Primary RootWindowController must be destroyed last.
   RootWindowController* primary_root_window_controller =
-      GetPrimaryRootWindowController();
+      Shell::GetPrimaryRootWindowController();
   std::set<RootWindowController*> secondary_root_window_controllers;
   for (auto& root_window_controller_ptr : root_window_controllers_) {
     if (root_window_controller_ptr.get() != primary_root_window_controller) {
       secondary_root_window_controllers.insert(
           root_window_controller_ptr.get());
     }
   }
   const bool in_shutdown = true;
   for (RootWindowController* root_window_controller :
        secondary_root_window_controllers) {
@@ skipping 42 matching lines @@
   CreateAndRegisterRootWindowController(
       std::move(window_tree_host), screen_->GetAllDisplays()[0],
       RootWindowController::RootWindowType::PRIMARY);
 }
 
 void WindowManager::CreateShell(
     std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) {
   DCHECK(!created_shell_);
   created_shell_ = true;
   ShellInitParams init_params;
-  ShellPortMash* shell_port = new ShellPortMash(
-      window_tree_host ? WmWindow::Get(window_tree_host->window()) : nullptr,
-      this, pointer_watcher_event_router_.get(),
-      create_session_state_delegate_stub_for_test_);
+  ShellPortMash* shell_port =
+      new ShellPortMash(window_tree_host ? window_tree_host->window() : nullptr,
+                        this, pointer_watcher_event_router_.get(),
+                        create_session_state_delegate_stub_for_test_);
   // Shell::CreateInstance() takes ownership of ShellDelegate.
   init_params.delegate = shell_delegate_ ? shell_delegate_.release()
                                          : new ShellDelegateMus(connector_);
   init_params.primary_window_tree_host = window_tree_host.release();
   init_params.shell_port = shell_port;
   init_params.blocking_pool = blocking_pool_.get();
   Shell::CreateInstance(init_params);
 }
 
 void WindowManager::CreateAndRegisterRootWindowController(
     std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
     const display::Display& display,
     RootWindowController::RootWindowType root_window_type) {
   RootWindowSettings* root_window_settings =
       InitRootWindowSettings(window_tree_host->window());
   root_window_settings->display_id = display.id();
   std::unique_ptr<RootWindowController> root_window_controller(
       new RootWindowController(nullptr, window_tree_host.release()));
   root_window_controller->Init(root_window_type);
   root_window_controllers_.insert(std::move(root_window_controller));
 }
 
 void WindowManager::DestroyRootWindowController(
     RootWindowController* root_window_controller,
     bool in_shutdown) {
   if (!in_shutdown && root_window_controllers_.size() > 1) {
-    DCHECK_NE(root_window_controller, GetPrimaryRootWindowController());
-    root_window_controller->MoveWindowsTo(
-        GetPrimaryRootWindowController()->GetRootWindow());
+    DCHECK_NE(root_window_controller, Shell::GetPrimaryRootWindowController());
+    root_window_controller->MoveWindowsTo(Shell::GetPrimaryRootWindow());
   }
 
   root_window_controller->Shutdown();
 
   for (auto iter = root_window_controllers_.begin();
        iter != root_window_controllers_.end(); ++iter) {
     if (iter->get() == root_window_controller) {
       root_window_controllers_.erase(iter);
       break;
     }
@@ skipping 10 matching lines @@
       capture_client);
 
   Shell::DeleteInstance();
 
   pointer_watcher_event_router_.reset();
 
   window_tree_client_.reset();
   window_manager_client_ = nullptr;
 }
 
-RootWindowController* WindowManager::GetPrimaryRootWindowController() {
-  return RootWindowController::ForWindow(ShellPort::Get()
-                                             ->GetPrimaryRootWindowController()
-                                             ->GetWindow()
-                                             ->aura_window());
-}
-
 void WindowManager::OnEmbed(
     std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) {
   // WindowManager should never see this, instead OnWmNewDisplay() is called.
   NOTREACHED();
 }
 
 void WindowManager::OnEmbedRootDestroyed(
     aura::WindowTreeHostMus* window_tree_host) {
   // WindowManager should never see this.
   NOTREACHED();
@@ skipping 263 matching lines @@
 bool WindowManager::IsWindowActive(aura::Window* window) {
   return Shell::Get()->activation_client()->GetActiveWindow() == window;
 }
 
 void WindowManager::OnWmDeactivateWindow(aura::Window* window) {
   Shell::Get()->activation_client()->DeactivateWindow(window);
 }
 
 }  // namespace mus
 }  // namespace ash