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

ash/wm/workspace_controller.cc

 // Copyright (c) 2012 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/wm/workspace_controller.h"
 
 #include <utility>
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shell_port.h"
 #include "ash/wm/fullscreen_window_finder.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/wm_window_animations.h"
 #include "ash/wm/workspace/backdrop_controller.h"
 #include "ash/wm/workspace/backdrop_delegate.h"
 #include "ash/wm/workspace/workspace_event_handler.h"
 #include "ash/wm/workspace/workspace_layout_manager.h"
-#include "ash/wm_window.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
+#include "ui/wm/core/window_animations.h"
 
 namespace ash {
 namespace {
 
 // Amount of time to pause before animating anything. Only used during initial
 // animation (when logging in).
 const int kInitialPauseTimeMS = 750;
 
 // The duration of the animation that occurs on first login.
 const int kInitialAnimationDurationMS = 200;
 
 }  // namespace
 
 WorkspaceController::WorkspaceController(aura::Window* viewport)
     : viewport_(viewport),
-      event_handler_(ShellPort::Get()->CreateWorkspaceEventHandler(
-          WmWindow::Get(viewport))),
+      event_handler_(ShellPort::Get()->CreateWorkspaceEventHandler(viewport)),
       layout_manager_(new WorkspaceLayoutManager(viewport)) {
   viewport_->AddObserver(this);
   ::wm::SetWindowVisibilityAnimationTransition(viewport_, ::wm::ANIMATE_NONE);
   viewport_->SetLayoutManager(layout_manager_);
 }
 
 WorkspaceController::~WorkspaceController() {
   if (!viewport_)
     return;
 
@@ skipping 67 matching lines @@
 void WorkspaceController::OnWindowDestroying(aura::Window* window) {
   DCHECK_EQ(window, viewport_);
   viewport_->RemoveObserver(this);
   viewport_ = nullptr;
   // Destroy |event_handler_| too as it depends upon |window|.
   event_handler_.reset();
   layout_manager_ = nullptr;
 }
 
 }  // namespace ash