[mus+ash] Removes WmWindow from ash/wm/overview and ash/wm/workspace

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 94 matching lines @@
   return Shell::Get()->display_manager()->IsInUnifiedMode();
 }
 
 bool ShellPortClassic::IsInUnifiedModeIgnoreMirroring() const {
   return Shell::Get()
              ->display_manager()
              ->current_default_multi_display_mode() ==
          display::DisplayManager::UNIFIED;
 }
 
-void ShellPortClassic::SetDisplayWorkAreaInsets(WmWindow* window,
+void ShellPortClassic::SetDisplayWorkAreaInsets(aura::Window* window,
                                                 const gfx::Insets& insets) {
   Shell::Get()
       ->window_tree_host_manager()
-      ->UpdateWorkAreaOfDisplayNearestWindow(window->aura_window(), insets);
+      ->UpdateWorkAreaOfDisplayNearestWindow(window, insets);
 }
 
 std::unique_ptr<display::TouchTransformSetter>
 ShellPortClassic::CreateTouchTransformDelegate() {
   return base::MakeUnique<display::DefaultTouchTransformSetter>();
 }
 
 void ShellPortClassic::LockCursor() {
   Shell::Get()->cursor_manager()->LockCursor();
 }
@@ skipping 54 matching lines @@
 ShellPortClassic::CreateWindowCycleEventFilter() {
   return base::MakeUnique<WindowCycleEventFilterAura>();
 }
 
 std::unique_ptr<wm::TabletModeEventHandler>
 ShellPortClassic::CreateTabletModeEventHandler() {
   return base::WrapUnique(new wm::TabletModeEventHandlerAura);
 }
 
 std::unique_ptr<WorkspaceEventHandler>
-ShellPortClassic::CreateWorkspaceEventHandler(WmWindow* workspace_window) {
+ShellPortClassic::CreateWorkspaceEventHandler(aura::Window* workspace_window) {
   return base::MakeUnique<WorkspaceEventHandlerAura>(workspace_window);
 }
 
 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
 ShellPortClassic::CreateScopedDisableInternalMouseAndKeyboard() {
 #if defined(USE_X11)
   return base::WrapUnique(new ScopedDisableInternalMouseAndKeyboardX11);
 #elif defined(USE_OZONE)
   return base::WrapUnique(new ScopedDisableInternalMouseAndKeyboardOzone);
 #endif
@@ skipping 100 matching lines @@
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanging();
 }
 
 void ShellPortClassic::OnDisplayConfigurationChanged() {
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanged();
 }
 
 }  // namespace ash