Shuffles and renames ash/common/wm classes

ash/wm/maximize_mode/maximize_mode_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/maximize_mode/maximize_mode_window_state.h"
 
 #include <utility>
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_animation_types.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/common/wm/wm_screen_util.h"
 #include "ash/common/wm/workspace/workspace_window_resizer.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
-#include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/geometry/rect.h"
@@ skipping 169 matching lines @@
 wm::WindowStateType MaximizeModeWindowState::GetType() const {
   return current_state_type_;
 }
 
 void MaximizeModeWindowState::AttachState(
     wm::WindowState* window_state,
     wm::WindowState::State* previous_state) {
   current_state_type_ = previous_state->GetType();
 
   aura::Window* window =
-      ash::wm::WmWindowAura::GetAuraWindow(window_state->window());
+      ash::WmWindowAura::GetAuraWindow(window_state->window());
   views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window);
   if (widget) {
     gfx::Rect bounds = widget->GetRestoredBounds();
     if (!bounds.IsEmpty()) {
       // We do not want to do a session restore to our window states. Therefore
       // we tell the window to use the current default states instead.
       window->SetProperty(ash::kRestoreShowStateOverrideKey,
                           window_state->GetShowState());
       window->SetProperty(ash::kRestoreBoundsOverrideKey,
                           new gfx::Rect(widget->GetRestoredBounds()));
     }
   }
 
   // Initialize the state to a good preset.
   if (current_state_type_ != wm::WINDOW_STATE_TYPE_MAXIMIZED &&
       current_state_type_ != wm::WINDOW_STATE_TYPE_MINIMIZED &&
       current_state_type_ != wm::WINDOW_STATE_TYPE_FULLSCREEN) {
     UpdateWindow(window_state,
                  GetMaximizedOrCenteredWindowType(window_state),
                  true);
   }
 
   window_state->set_can_be_dragged(false);
 }
 
 void MaximizeModeWindowState::DetachState(wm::WindowState* window_state) {
   // From now on, we can use the default session restore mechanism again.
-  ash::wm::WmWindowAura::GetAuraWindow(window_state->window())
+  ash::WmWindowAura::GetAuraWindow(window_state->window())
       ->ClearProperty(ash::kRestoreBoundsOverrideKey);
   window_state->set_can_be_dragged(true);
 }
 
 void MaximizeModeWindowState::UpdateWindow(wm::WindowState* window_state,
                                            wm::WindowStateType target_state,
                                            bool animated) {
   DCHECK(target_state == wm::WINDOW_STATE_TYPE_MINIMIZED ||
          target_state == wm::WINDOW_STATE_TYPE_MAXIMIZED ||
          (target_state == wm::WINDOW_STATE_TYPE_NORMAL &&
@@ skipping 59 matching lines @@
       // avoid flashing.
       if (window_state->IsMaximized())
         window_state->SetBoundsDirectCrossFade(bounds_in_parent);
       else
         window_state->SetBoundsDirectAnimated(bounds_in_parent);
     }
   }
 }
 
 }  // namespace ash