Revert "Disabled WorkspaceWindowResizerTest.Edge since it got broken by https://chromiumcodereview.…

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_ash.h"
 #include "ash/shell.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_util.h"
@@ skipping 96 matching lines @@
       window_component(HTNOWHERE),
       bounds_change(0),
       position_change_direction(0),
       size_change_direction(0),
       is_resizable(false) {
 }
 
 WindowResizer::Details::Details(aura::Window* window,
                                 const gfx::Point& location,
                                 int window_component)
-    : window(window),
-      initial_bounds_in_parent(window->bounds()),
-      restore_bounds(gfx::Rect()),
-      initial_location_in_parent(location),
-      initial_opacity(window->layer()->opacity()),
-      window_component(window_component),
-      bounds_change(GetBoundsChangeForWindowComponent(window_component)),
-      position_change_direction(
-          GetPositionChangeDirectionForWindowComponent(window_component)),
-      size_change_direction(
-          GetSizeChangeDirectionForWindowComponent(window_component)),
-      is_resizable(bounds_change != kBoundsChangeDirection_None) {
+  : window(window),
+    initial_bounds(window->bounds()),
+    restore_bounds(gfx::Rect()),
+    initial_location_in_parent(location),
+    initial_opacity(window->layer()->opacity()),
+    window_component(window_component),
+    bounds_change(GetBoundsChangeForWindowComponent(window_component)),
+    position_change_direction(
+        GetPositionChangeDirectionForWindowComponent(window_component)),
+    size_change_direction(
+        GetSizeChangeDirectionForWindowComponent(window_component)),
+    is_resizable(bounds_change != kBoundsChangeDirection_None) {
   if (wm::IsWindowNormal(window) &&
       GetRestoreBoundsInScreen(window) &&
       window_component == HTCAPTION)
     restore_bounds = *GetRestoreBoundsInScreen(window);
 }
 
 WindowResizer::Details::~Details() {
 }
 
 WindowResizer::WindowResizer() {
@@ skipping 27 matching lines @@
       break;
   }
   return bounds_change;
 }
 
 // static
 gfx::Rect WindowResizer::CalculateBoundsForDrag(
     const Details& details,
     const gfx::Point& passed_location) {
   if (!details.is_resizable)
-    return details.initial_bounds_in_parent;
+    return details.initial_bounds;
 
   gfx::Point location = passed_location;
   gfx::Rect work_area =
       ScreenAsh::GetDisplayWorkAreaBoundsInParent(details.window);
 
   int delta_x = location.x() - details.initial_location_in_parent.x();
   int delta_y = location.y() - details.initial_location_in_parent.y();
 
   // The minimize size constraint may limit how much we change the window
   // position.  For example, dragging the left edge to the right should stop
@@ skipping 43 matching lines @@
     }
   }
 
   if (details.bounds_change & kBoundsChange_Repositions) {
     // When we might want to reposition a window which is also restored to its
     // previous size, to keep the cursor within the dragged window.
     if (!details.restore_bounds.IsEmpty()) {
       // However - it is not desirable to change the origin if the window would
       // be still hit by the cursor.
       if (details.initial_location_in_parent.x() >
-          details.initial_bounds_in_parent.x() + details.restore_bounds.width())
+              details.initial_bounds.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.
     aura::Window* parent = details.window->parent();
     gfx::Rect new_bounds_in_screen =
         ScreenAsh::ConvertRectToScreen(parent, new_bounds);
     const gfx::Display& display =
@@ skipping 19 matching lines @@
   return window_component == HTBOTTOMLEFT ||
       window_component == HTBOTTOM ||
       window_component == HTBOTTOMRIGHT ||
       window_component == HTGROWBOX;
 }
 
 // static
 gfx::Point WindowResizer::GetOriginForDrag(const Details& details,
                                            int delta_x,
                                            int delta_y) {
-  gfx::Point origin = details.initial_bounds_in_parent.origin();
+  gfx::Point origin = details.initial_bounds.origin();
   if (details.bounds_change & kBoundsChange_Repositions) {
     int pos_change_direction =
         GetPositionChangeDirectionForWindowComponent(details.window_component);
     if (pos_change_direction & kBoundsChangeDirection_Horizontal)
       origin.Offset(delta_x, 0);
     if (pos_change_direction & kBoundsChangeDirection_Vertical)
       origin.Offset(0, delta_y);
   }
   return origin;
 }
 
 // static
 gfx::Size WindowResizer::GetSizeForDrag(const Details& details,
                                         int* delta_x,
                                         int* delta_y) {
-  gfx::Size size = details.initial_bounds_in_parent.size();
+  gfx::Size size = details.initial_bounds.size();
   if (details.bounds_change & kBoundsChange_Resizes) {
     gfx::Size min_size = details.window->delegate()->GetMinimumSize();
     size.SetSize(GetWidthForDrag(details, min_size.width(), delta_x),
                  GetHeightForDrag(details, min_size.height(), delta_y));
   } else if (!details.restore_bounds.IsEmpty()) {
     size = details.restore_bounds.size();
   }
   return size;
 }
 
 // static
 int WindowResizer::GetWidthForDrag(const Details& details,
                                    int min_width,
                                    int* delta_x) {
-  int width = details.initial_bounds_in_parent.width();
+  int width = details.initial_bounds.width();
   if (details.size_change_direction & kBoundsChangeDirection_Horizontal) {
     // Along the right edge, positive delta_x increases the window size.
     int x_multiplier = IsRightEdge(details.window_component) ? 1 : -1;
     width += x_multiplier * (*delta_x);
 
     // Ensure we don't shrink past the minimum width and clamp delta_x
     // for the window origin computation.
     if (width < min_width) {
       width = min_width;
-      *delta_x = -x_multiplier * (details.initial_bounds_in_parent.width() -
-                                  min_width);
+      *delta_x = -x_multiplier * (details.initial_bounds.width() - min_width);
     }
 
     // And don't let the window go bigger than the display.
     int max_width = Shell::GetScreen()->GetDisplayNearestWindow(
         details.window).bounds().width();
     if (width > max_width) {
       width = max_width;
-      *delta_x = -x_multiplier * (details.initial_bounds_in_parent.width() -
-                                  max_width);
+      *delta_x = -x_multiplier * (details.initial_bounds.width() - max_width);
     }
   }
   return width;
 }
 
 // static
 int WindowResizer::GetHeightForDrag(const Details& details,
                                     int min_height,
                                     int* delta_y) {
-  int height = details.initial_bounds_in_parent.height();
+  int height = details.initial_bounds.height();
   if (details.size_change_direction & kBoundsChangeDirection_Vertical) {
     // Along the bottom edge, positive delta_y increases the window size.
     int y_multiplier = IsBottomEdge(details.window_component) ? 1 : -1;
     height += y_multiplier * (*delta_y);
 
     // Ensure we don't shrink past the minimum height and clamp delta_y
     // for the window origin computation.
     if (height < min_height) {
       height = min_height;
-      *delta_y = -y_multiplier * (details.initial_bounds_in_parent.height() -
-                                  min_height);
+      *delta_y = -y_multiplier * (details.initial_bounds.height() - min_height);
     }
 
     // And don't let the window go bigger than the display.
     int max_height = Shell::GetScreen()->GetDisplayNearestWindow(
         details.window).bounds().height();
     if (height > max_height) {
       height = max_height;
-      *delta_y = -y_multiplier * (details.initial_bounds_in_parent.height() -
-                                  max_height);
+      *delta_y = -y_multiplier * (details.initial_bounds.height() - max_height);
     }
   }
   return height;
 }
 
 }  // namespace aura