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

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 240 matching lines @@
                ->display_manager()
                ->current_default_multi_display_mode() ==
            display::DisplayManager::UNIFIED;
   }
 
   // TODO(mash): implement http://crbug.com/622480.
   NOTIMPLEMENTED();
   return false;
 }
 
-void ShellPortMash::SetDisplayWorkAreaInsets(WmWindow* window,
+void ShellPortMash::SetDisplayWorkAreaInsets(aura::Window* window,
                                              const gfx::Insets& insets) {
   if (GetAshConfig() == Config::MUS) {
     Shell::Get()
         ->window_tree_host_manager()
-        ->UpdateWorkAreaOfDisplayNearestWindow(window->aura_window(), insets);
+        ->UpdateWorkAreaOfDisplayNearestWindow(window, insets);
     return;
   }
-  window_manager_->screen()->SetWorkAreaInsets(window->aura_window(), insets);
+  window_manager_->screen()->SetWorkAreaInsets(window, insets);
 }
 
 std::unique_ptr<display::TouchTransformSetter>
 ShellPortMash::CreateTouchTransformDelegate() {
   return base::MakeUnique<TouchTransformSetterMus>(
       window_manager_->connector());
 }
 
 void ShellPortMash::LockCursor() {
   window_manager_->window_manager_client()->LockCursor();
@@ skipping 111 matching lines @@
     return nullptr;
 #endif
   }
 
   // TODO: needs implementation for mus, http://crbug.com/624967.
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 std::unique_ptr<WorkspaceEventHandler>
-ShellPortMash::CreateWorkspaceEventHandler(WmWindow* workspace_window) {
+ShellPortMash::CreateWorkspaceEventHandler(aura::Window* workspace_window) {
   if (GetAshConfig() == Config::MUS)
     return base::MakeUnique<WorkspaceEventHandlerAura>(workspace_window);
 
-  return base::MakeUnique<WorkspaceEventHandlerMus>(
-      WmWindow::GetAuraWindow(workspace_window));
+  return base::MakeUnique<WorkspaceEventHandlerMus>(workspace_window);
 }
 
 std::unique_ptr<ImmersiveFullscreenController>
 ShellPortMash::CreateImmersiveFullscreenController() {
   return base::MakeUnique<ImmersiveFullscreenController>();
 }
 
 std::unique_ptr<KeyboardUI> ShellPortMash::CreateKeyboardUI() {
   if (GetAshConfig() == Config::MUS)
     return KeyboardUI::Create();
@@ skipping 218 matching lines @@
     observer.OnDisplayConfigurationChanging();
 }
 
 void ShellPortMash::OnDisplayConfigurationChanged() {
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanged();
 }
 
 }  // namespace mus
 }  // namespace ash