Shuffles and renames ash/common/wm classes

ash/wm/lock_window_state.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/lock_window_state.h"
 
 #include <utility>
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/wm/window_animation_types.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/window_state_delegate.h"
 #include "ash/common/wm/window_state_util.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/display/display_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
-#include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/lock_layout_manager.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_util.h"
 #include "ui/wm/core/window_animations.h"
 
 namespace ash {
 
 LockWindowState::LockWindowState(aura::Window* window)
     : current_state_type_(wm::GetWindowState(window)->GetStateType()) {
 }
 
 LockWindowState::~LockWindowState() {
 }
 
 void LockWindowState::OnWMEvent(wm::WindowState* window_state,
                                 const wm::WMEvent* event) {
   aura::Window* window =
-      ash::wm::WmWindowAura::GetAuraWindow(window_state->window());
+      ash::WmWindowAura::GetAuraWindow(window_state->window());
   gfx::Rect bounds = window->bounds();
 
   switch (event->type()) {
     case wm::WM_EVENT_TOGGLE_FULLSCREEN:
       ToggleFullScreen(window_state, window_state->delegate());
       break;
     case wm::WM_EVENT_FULLSCREEN:
       UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_FULLSCREEN);
       break;
     case wm::WM_EVENT_TOGGLE_MAXIMIZE_CAPTION:
@@ skipping 138 matching lines @@
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
   gfx::Rect keyboard_bounds;
 
   if (keyboard_controller &&
       !keyboard::IsKeyboardOverscrollEnabled() &&
       keyboard_controller->keyboard_visible()) {
     keyboard_bounds = keyboard_controller->current_keyboard_bounds();
   }
   gfx::Rect bounds = ScreenUtil::GetShelfDisplayBoundsInRoot(
-      ash::wm::WmWindowAura::GetAuraWindow(window_state->window()));
+      ash::WmWindowAura::GetAuraWindow(window_state->window()));
 
   bounds.set_height(bounds.height() - keyboard_bounds.height());
 
   VLOG(1) << "Updating window bounds to: " << bounds.ToString();
   window_state->SetBoundsDirect(bounds);
 }
 
 }  // namespace ash