Adds WmWindow and converts WindowState to use it

ash/wm/lock_window_state.cc

Index: ash/wm/lock_window_state.cc
diff --git a/ash/wm/lock_window_state.cc b/ash/wm/lock_window_state.cc
index d5f89a3d707be24b6396f2e585764c52808bbac3..12bf13a52b3a059240bfc583b2117882caa48be9 100644
--- a/ash/wm/lock_window_state.cc
+++ b/ash/wm/lock_window_state.cc
@@ -12,6 +12,7 @@
 #include "ash/wm/lock_layout_manager.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_state.h"
+#include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_state_delegate.h"
 #include "ash/wm/window_state_util.h"
 #include "ash/wm/window_util.h"
@@ -34,7 +35,7 @@ LockWindowState::~LockWindowState() {
 
 void LockWindowState::OnWMEvent(wm::WindowState* window_state,
                                 const wm::WMEvent* event) {
-  aura::Window* window = window_state->window();
+  aura::Window* window = window_state->aura_window();
   gfx::Rect bounds = window->bounds();
 
   switch (event->type()) {
@@ -133,7 +134,7 @@ void LockWindowState::UpdateWindow(wm::WindowState* window_state,
 
     current_state_type_ = target_state;
     ::wm::SetWindowVisibilityAnimationType(
-        window_state->window(), WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE);
+        window_state->aura_window(), WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE);
     window_state->window()->Hide();
     if (window_state->IsActive())
       window_state->Deactivate();
@@ -153,9 +154,9 @@ void LockWindowState::UpdateWindow(wm::WindowState* window_state,
   UpdateBounds(window_state);
   window_state->NotifyPostStateTypeChange(old_state_type);
 
-  if ((window_state->window()->TargetVisibility() ||
-      old_state_type == wm::WINDOW_STATE_TYPE_MINIMIZED) &&
-      !window_state->window()->layer()->visible()) {
+  if ((window_state->aura_window()->TargetVisibility() ||
+       old_state_type == wm::WINDOW_STATE_TYPE_MINIMIZED) &&
+      !window_state->aura_window()->layer()->visible()) {
     // The layer may be hidden if the window was previously minimized. Make
     // sure it's visible.
     window_state->window()->Show();
@@ -193,7 +194,7 @@ void LockWindowState::UpdateBounds(wm::WindowState* window_state) {
     keyboard_bounds = keyboard_controller->current_keyboard_bounds();
   }
   gfx::Rect bounds =
-      ScreenUtil::GetShelfDisplayBoundsInRoot(window_state->window());
+      ScreenUtil::GetShelfDisplayBoundsInRoot(window_state->aura_window());
 
   bounds.set_height(bounds.height() - keyboard_bounds.height());