Shuffles and renames ash/common/wm classes

ash/common/wm/window_resizer.cc

 // Copyright (c) 2012 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_resizer.h"
 
 #include "ash/common/wm/dock/docked_window_layout_manager.h"
 #include "ash/common/wm/root_window_finder.h"
 #include "ash/common/wm/window_positioning_utils.h"
 #include "ash/common/wm/window_state.h"
-#include "ash/common/wm/wm_window.h"
+#include "ash/common/wm_window.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ash {
 
 namespace {
 
@@ skipping 156 matching lines @@
       // be still hit by the cursor.
       if (details().initial_location_in_parent.x() >
           details().initial_bounds_in_parent.x() +
               details().restore_bounds.width())
         new_bounds.set_x(location.x() - details().restore_bounds.width() / 2);
     }
 
     // Make sure that |new_bounds| doesn't leave any of the displays.  Note that
     // the |work_area| above isn't good for this check since it is the work area
     // for the current display but the window can move to a different one.
-    wm::WmWindow* parent = GetTarget()->GetParent();
+    WmWindow* parent = GetTarget()->GetParent();
     gfx::Point passed_location_in_screen(
         parent->ConvertPointToScreen(passed_location));
     gfx::Rect near_passed_location(passed_location_in_screen, gfx::Size());
     // Use a pointer location (matching the logic in DragWindowResizer) to
     // calculate the target display after the drag.
     const display::Display& display =
         display::Screen::GetScreen()->GetDisplayMatching(near_passed_location);
     DockedWindowLayoutManager* dock_layout = DockedWindowLayoutManager::Get(
         wm::GetRootWindowMatching(near_passed_location));
 
@@ skipping 121 matching lines @@
     if (height > max_height) {
       height = max_height;
       *delta_y = -y_multiplier *
                  (details().initial_bounds_in_parent.height() - max_height);
     }
   }
   return height;
 }
 
 }  // namespace ash