Shuffles and renames ash/common/wm classes

ash/frame/caption_buttons/frame_size_button.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/frame/caption_buttons/frame_size_button.h"
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/wm/window_positioning_utils.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm/workspace/phantom_window_controller.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
-#include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/i18n/rtl.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // The default delay between the user pressing the size button and the buttons
 // adjacent to the size button morphing into buttons for snapping left and
@@ skipping 192 matching lines @@
       case CAPTION_BUTTON_ICON_COUNT:
         NOTREACHED();
         break;
     }
   }
 
   if (snap_type_ == SNAP_LEFT || snap_type_ == SNAP_RIGHT) {
     aura::Window* window = frame_->GetNativeWindow();
     if (!phantom_window_controller_.get()) {
       phantom_window_controller_.reset(
-          new PhantomWindowController(wm::WmWindowAura::Get(window)));
+          new PhantomWindowController(WmWindowAura::Get(window)));
     }
     gfx::Rect phantom_bounds_in_parent =
         (snap_type_ == SNAP_LEFT)
             ? wm::GetDefaultLeftSnappedWindowBoundsInParent(
-                  wm::WmWindowAura::Get(window))
+                  WmWindowAura::Get(window))
             : wm::GetDefaultRightSnappedWindowBoundsInParent(
-                  wm::WmWindowAura::Get(window));
+                  WmWindowAura::Get(window));
     phantom_window_controller_->Show(ScreenUtil::ConvertRectToScreen(
         window->parent(), phantom_bounds_in_parent));
   } else {
     phantom_window_controller_.reset();
   }
 }
 
 const FrameCaptionButton* FrameSizeButton::GetButtonToHover(
     const gfx::Point& event_location_in_screen) const {
   const FrameCaptionButton* closest_button = delegate_->GetButtonClosestTo(
@@ skipping 34 matching lines @@
 void FrameSizeButton::SetButtonsToNormalMode(
     FrameSizeButtonDelegate::Animate animate) {
   in_snap_mode_ = false;
   snap_type_ = SNAP_NONE;
   set_buttons_to_snap_mode_timer_.Stop();
   delegate_->SetButtonsToNormal(animate);
   phantom_window_controller_.reset();
 }
 
 }  // namespace ash