chromeos: converts WindowState to aura::Window

ash/wm/drag_details.cc

 // Copyright 2014 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/drag_details.h"
 
 #include "ash/public/cpp/window_properties.h"
 #include "ash/wm/window_resizer.h"
-#include "ash/wm_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/layer.h"
 
 namespace ash {
 
 namespace {
 
 int GetSizeChangeDirectionForWindowComponent(int window_component) {
   int size_change_direction = WindowResizer::kBoundsChangeDirection_None;
@@ skipping 17 matching lines @@
       size_change_direction |= WindowResizer::kBoundsChangeDirection_Horizontal;
       break;
     default:
       break;
   }
   return size_change_direction;
 }
 
 }  // namespace
 
-DragDetails::DragDetails(WmWindow* window,
+DragDetails::DragDetails(aura::Window* window,
                          const gfx::Point& location,
                          int window_component,
                          aura::client::WindowMoveSource source)
-    : initial_state_type(window->GetWindowState()->GetStateType()),
-      initial_bounds_in_parent(window->GetBounds()),
+    : initial_state_type(wm::GetWindowState(window)->GetStateType()),
+      initial_bounds_in_parent(window->bounds()),
       initial_location_in_parent(location),
       // When drag starts, we might be in the middle of a window opacity
       // animation, on drag completion we must set the opacity to the target
       // opacity rather than the current opacity (crbug.com/687003).
-      initial_opacity(window->GetLayer()->GetTargetOpacity()),
+      initial_opacity(window->layer()->GetTargetOpacity()),
       window_component(window_component),
       bounds_change(
           WindowResizer::GetBoundsChangeForWindowComponent(window_component)),
       position_change_direction(
           WindowResizer::GetPositionChangeDirectionForWindowComponent(
               window_component)),
       size_change_direction(
           GetSizeChangeDirectionForWindowComponent(window_component)),
       is_resizable(bounds_change != WindowResizer::kBoundsChangeDirection_None),
       source(source),
-      should_attach_to_shelf(
-          window->GetType() == ui::wm::WINDOW_TYPE_PANEL &&
-          window->aura_window()->GetProperty(kPanelAttachedKey)) {
-  wm::WindowState* window_state = window->GetWindowState();
+      should_attach_to_shelf(window->type() == ui::wm::WINDOW_TYPE_PANEL &&
+                             window->GetProperty(kPanelAttachedKey)) {
+  wm::WindowState* window_state = wm::GetWindowState(window);
   if (window_state->IsNormalOrSnapped() && window_state->HasRestoreBounds() &&
       window_component == HTCAPTION) {
     restore_bounds = window_state->GetRestoreBoundsInScreen();
   }
 }
 
 DragDetails::~DragDetails() {}
 
 }  // namespace ash