mash: remove more shell/shelf WmWindow usage.

ash/mus/bridge/shell_port_mash.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/mus/bridge/shell_port_mash.h"
 
 #include <utility>
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
@@ skipping 95 matching lines @@
 
 ShellPortMash::MashSpecificState::MashSpecificState() = default;
 
 ShellPortMash::MashSpecificState::~MashSpecificState() = default;
 
 ShellPortMash::MusSpecificState::MusSpecificState() = default;
 
 ShellPortMash::MusSpecificState::~MusSpecificState() = default;
 
 ShellPortMash::ShellPortMash(
-    WmWindow* primary_root_window,
+    aura::Window* primary_root_window,
     WindowManager* window_manager,
     views::PointerWatcherEventRouter* pointer_watcher_event_router,
     bool create_session_state_delegate_stub)
     : window_manager_(window_manager),
       primary_root_window_(primary_root_window) {
   if (create_session_state_delegate_stub)
     session_state_delegate_ = base::MakeUnique<SessionStateDelegateStub>();
 
   if (GetAshConfig() == Config::MASH) {
     mash_state_ = base::MakeUnique<MashSpecificState>();
@@ skipping 45 matching lines @@
   if (GetAshConfig() == Config::MUS)
     Shell::Get()->window_tree_host_manager()->Shutdown();
   else
     window_manager_->DeleteAllRootWindowControllers();
 }
 
 Config ShellPortMash::GetAshConfig() const {
   return window_manager_->config();
 }
 
-WmWindow* ShellPortMash::GetPrimaryRootWindow() {
-  if (GetAshConfig() == Config::MUS) {
-    return WmWindow::Get(
-        Shell::Get()->window_tree_host_manager()->GetPrimaryRootWindow());
-  }
+aura::Window* ShellPortMash::GetPrimaryRootWindow() {
+  if (GetAshConfig() == Config::MUS)
+    return Shell::Get()->window_tree_host_manager()->GetPrimaryRootWindow();
   // NOTE: This is called before the RootWindowController has been created, so
   // it can't call through to RootWindowController to get all windows.
   return primary_root_window_;
 }
 
-WmWindow* ShellPortMash::GetRootWindowForDisplayId(int64_t display_id) {
+aura::Window* ShellPortMash::GetRootWindowForDisplayId(int64_t display_id) {
   if (GetAshConfig() == Config::MUS) {
-    return WmWindow::Get(
-        Shell::Get()->window_tree_host_manager()->GetRootWindowForDisplayId(
-            display_id));
+    return Shell::Get()->window_tree_host_manager()->GetRootWindowForDisplayId(
+        display_id);
   }
   RootWindowController* root_window_controller =
       GetRootWindowControllerWithDisplayId(display_id);
-  return root_window_controller
-             ? WmWindow::Get(root_window_controller->GetRootWindow())
-             : nullptr;
+  return root_window_controller ? root_window_controller->GetRootWindow()
+                                : nullptr;
 }
 
 const display::ManagedDisplayInfo& ShellPortMash::GetDisplayInfo(
     int64_t display_id) const {
   // TODO(sky): mash should use this too http://crbug.com/718860.
   if (GetAshConfig() == Config::MUS)
     return Shell::Get()->display_manager()->GetDisplayInfo(display_id);
 
   // TODO(mash): implement http://crbug.com/622480.
   NOTIMPLEMENTED();
@@ skipping 419 matching lines @@
     observer.OnDisplayConfigurationChanging();
 }
 
 void ShellPortMash::OnDisplayConfigurationChanged() {
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanged();
 }
 
 }  // namespace mus
 }  // namespace ash