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

ash/wm/tablet_mode/tablet_mode_event_handler.cc

Index: ash/wm/tablet_mode/tablet_mode_event_handler.cc
diff --git a/ash/wm/tablet_mode/tablet_mode_event_handler.cc b/ash/wm/tablet_mode/tablet_mode_event_handler.cc
index 9267e15fd9df77ca08d5e224450a8240f6874bba..73aead13cc22562edfd61dfba122e82107335402 100644
--- a/ash/wm/tablet_mode/tablet_mode_event_handler.cc
+++ b/ash/wm/tablet_mode/tablet_mode_event_handler.cc
@@ -9,7 +9,6 @@
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/wm_event.h"
-#include "ash/wm_window.h"
 #include "ui/events/event.h"
 
 namespace ash {
@@ -38,18 +37,18 @@ bool TabletModeEventHandler::ToggleFullscreen(const ui::TouchEvent& event) {
   }
 
   // Find the active window (from the primary screen) to un-fullscreen.
-  WmWindow* window = WmWindow::Get(GetActiveWindow());
+  aura::Window* window = GetActiveWindow();
   if (!window)
     return false;
 
-  WindowState* window_state = window->GetWindowState();
+  WindowState* window_state = GetWindowState(window);
   if (!window_state->IsFullscreen() || window_state->in_immersive_fullscreen())
     return false;
 
   // Test that the touch happened in the top or bottom lines.
   int y = event.y();
   if (y >= kLeaveFullScreenAreaHeightInPixel &&
-      y < (window->GetBounds().height() - kLeaveFullScreenAreaHeightInPixel)) {
+      y < (window->bounds().height() - kLeaveFullScreenAreaHeightInPixel)) {
     return false;
   }
 
@@ -58,7 +57,7 @@ bool TabletModeEventHandler::ToggleFullscreen(const ui::TouchEvent& event) {
     return false;
 
   WMEvent toggle_fullscreen(WM_EVENT_TOGGLE_FULLSCREEN);
-  window->GetWindowState()->OnWMEvent(&toggle_fullscreen);
+  GetWindowState(window)->OnWMEvent(&toggle_fullscreen);
   return true;
 }