Shuffles and renames ash/common/wm classes

ash/common/wm/window_positioning_utils.cc

 // Copyright 2016 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/common/wm/window_positioning_utils.h"
 
 #include <algorithm>
 
 #include "ash/common/wm/wm_screen_util.h"
-#include "ash/common/wm/wm_window.h"
+#include "ash/common/wm_window.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace ash {
 namespace wm {
 
 namespace {
 
 // Returns the default width of a snapped window.
 int GetDefaultSnappedWindowWidth(WmWindow* window) {
@@ skipping 35 matching lines @@
   if (bounds->y() < visible_area.y())
     bounds->set_y(visible_area.y());
 }
 
 void AdjustBoundsToEnsureMinimumWindowVisibility(const gfx::Rect& visible_area,
                                                  gfx::Rect* bounds) {
   AdjustBoundsToEnsureWindowVisibility(visible_area, kMinimumOnScreenArea,
                                        kMinimumOnScreenArea, bounds);
 }
 
-gfx::Rect GetDefaultLeftSnappedWindowBoundsInParent(wm::WmWindow* window) {
+gfx::Rect GetDefaultLeftSnappedWindowBoundsInParent(WmWindow* window) {
   gfx::Rect work_area_in_parent(GetDisplayWorkAreaBoundsInParent(window));
   return gfx::Rect(work_area_in_parent.x(), work_area_in_parent.y(),
                    GetDefaultSnappedWindowWidth(window),
                    work_area_in_parent.height());
 }
 
-gfx::Rect GetDefaultRightSnappedWindowBoundsInParent(wm::WmWindow* window) {
+gfx::Rect GetDefaultRightSnappedWindowBoundsInParent(WmWindow* window) {
   gfx::Rect work_area_in_parent(GetDisplayWorkAreaBoundsInParent(window));
   int width = GetDefaultSnappedWindowWidth(window);
   return gfx::Rect(work_area_in_parent.right() - width, work_area_in_parent.y(),
                    width, work_area_in_parent.height());
 }
 
 }  // namespace wm
 }  // namespace ash