Removes aura dependencies from WindowPositioner

ash/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/wm/window_resizer.h"
 
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
+#include "ash/wm/common/window_positioning_utils.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/dock/docked_window_layout_manager.h"
 #include "ash/wm/window_state.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/aura/window_event_dispatcher.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
@@ skipping 124 matching lines @@
         GetTarget()->GetRootWindow(), kShellWindowId_DockedContainer);
     DockedWindowLayoutManager* dock_layout =
         static_cast<DockedWindowLayoutManager*>(
             dock_container->layout_manager());
 
     work_area.Union(dock_layout->docked_bounds());
     work_area = ScreenUtil::ConvertRectFromScreen(GetTarget()->parent(),
                                                  work_area);
     if (details().size_change_direction & kBoundsChangeDirection_Horizontal) {
       if (IsRightEdge(details().window_component) &&
-          new_bounds.right() < work_area.x() + kMinimumOnScreenArea) {
-        int delta = work_area.x() + kMinimumOnScreenArea - new_bounds.right();
+          new_bounds.right() < work_area.x() + wm::kMinimumOnScreenArea) {
+        int delta =
+            work_area.x() + wm::kMinimumOnScreenArea - new_bounds.right();
         new_bounds.set_width(new_bounds.width() + delta);
-      } else if (new_bounds.x() > work_area.right() - kMinimumOnScreenArea) {
-        int width = new_bounds.right() - work_area.right() +
-                    kMinimumOnScreenArea;
-        new_bounds.set_x(work_area.right() - kMinimumOnScreenArea);
+      } else if (new_bounds.x() >
+                 work_area.right() - wm::kMinimumOnScreenArea) {
+        int width =
+            new_bounds.right() - work_area.right() + wm::kMinimumOnScreenArea;
+        new_bounds.set_x(work_area.right() - wm::kMinimumOnScreenArea);
         new_bounds.set_width(width);
       }
     }
     if (details().size_change_direction & kBoundsChangeDirection_Vertical) {
       if (!IsBottomEdge(details().window_component) &&
-          new_bounds.y() > work_area.bottom() - kMinimumOnScreenArea) {
-        int height = new_bounds.bottom() - work_area.bottom() +
-                     kMinimumOnScreenArea;
-        new_bounds.set_y(work_area.bottom() - kMinimumOnScreenArea);
+          new_bounds.y() > work_area.bottom() - wm::kMinimumOnScreenArea) {
+        int height =
+            new_bounds.bottom() - work_area.bottom() + wm::kMinimumOnScreenArea;
+        new_bounds.set_y(work_area.bottom() - wm::kMinimumOnScreenArea);
         new_bounds.set_height(height);
       } else if (details().window_component == HTBOTTOM ||
                  details().window_component == HTBOTTOMRIGHT ||
                  details().window_component == HTBOTTOMLEFT) {
         // Update bottom edge to stay in the work area when we are resizing
         // by dragging the bottom edge or corners.
         if (new_bounds.bottom() > work_area.bottom())
           new_bounds.Inset(0, 0, 0,
                            new_bounds.bottom() - work_area.bottom());
       }
@@ skipping 31 matching lines @@
         gfx::Screen::GetScreen()->GetDisplayMatching(near_passed_location);
     aura::Window* dock_container =
         Shell::GetContainer(wm::GetRootWindowMatching(near_passed_location),
                             kShellWindowId_DockedContainer);
     DockedWindowLayoutManager* dock_layout =
         static_cast<DockedWindowLayoutManager*>(
             dock_container->layout_manager());
 
     gfx::Rect screen_work_area = display.work_area();
     screen_work_area.Union(dock_layout->docked_bounds());
-    screen_work_area.Inset(kMinimumOnScreenArea, 0);
+    screen_work_area.Inset(wm::kMinimumOnScreenArea, 0);
     gfx::Rect new_bounds_in_screen =
         ScreenUtil::ConvertRectToScreen(parent, new_bounds);
     if (!screen_work_area.Intersects(new_bounds_in_screen)) {
       // Make sure that the x origin does not leave the current display.
       new_bounds_in_screen.set_x(
           std::max(screen_work_area.x() - new_bounds.width(),
                    std::min(screen_work_area.right(),
                             new_bounds_in_screen.x())));
       new_bounds =
           ScreenUtil::ConvertRectFromScreen(parent, new_bounds_in_screen);
@@ skipping 119 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