mash: remove more shell/shelf WmWindow usage.

ash/aura/shell_port_classic.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/aura/shell_port_classic.h"
 
 #include <utility>
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
@@ skipping 60 matching lines @@
 
   ShellPort::Shutdown();
 
   Shell::Get()->window_tree_host_manager()->Shutdown();
 }
 
 Config ShellPortClassic::GetAshConfig() const {
   return Config::CLASSIC;
 }
 
-WmWindow* ShellPortClassic::GetPrimaryRootWindow() {
-  return WmWindow::Get(
-      Shell::Get()->window_tree_host_manager()->GetPrimaryRootWindow());
+aura::Window* ShellPortClassic::GetPrimaryRootWindow() {
+  return Shell::Get()->window_tree_host_manager()->GetPrimaryRootWindow();
 }
 
-WmWindow* ShellPortClassic::GetRootWindowForDisplayId(int64_t display_id) {
-  return WmWindow::Get(
-      Shell::Get()->window_tree_host_manager()->GetRootWindowForDisplayId(
-          display_id));
+aura::Window* ShellPortClassic::GetRootWindowForDisplayId(int64_t display_id) {
+  return Shell::Get()->window_tree_host_manager()->GetRootWindowForDisplayId(
+      display_id);
 }
 
 const display::ManagedDisplayInfo& ShellPortClassic::GetDisplayInfo(
     int64_t display_id) const {
   return Shell::Get()->display_manager()->GetDisplayInfo(display_id);
 }
 
 bool ShellPortClassic::IsActiveDisplayId(int64_t display_id) const {
   return Shell::Get()->display_manager()->IsActiveDisplayId(display_id);
 }
@@ skipping 201 matching lines @@
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanging();
 }
 
 void ShellPortClassic::OnDisplayConfigurationChanged() {
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanged();
 }
 
 }  // namespace ash