Cleanup: remove Details::window. Use GetTarget() when possible

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/shell_window_ids.h"
 #include "ash/wm/coordinate_conversion.h"
@@ skipping 87 matching lines @@
 const int WindowResizer::kBoundsChange_Resizes = 2;
 
 // static
 const int WindowResizer::kBoundsChangeDirection_None = 0;
 // static
 const int WindowResizer::kBoundsChangeDirection_Horizontal = 1;
 // static
 const int WindowResizer::kBoundsChangeDirection_Vertical = 2;
 
 WindowResizer::Details::Details()
-    : window(NULL),
-      window_state(NULL),
+    : window_state(NULL),
       window_component(HTNOWHERE),
       bounds_change(0),
       position_change_direction(0),
       size_change_direction(0),
       is_resizable(false),
       source(aura::client::WINDOW_MOVE_SOURCE_MOUSE) {
 }
 
 WindowResizer::Details::Details(aura::Window* window,
                                 const gfx::Point& location,
                                 int window_component,
                                 aura::client::WindowMoveSource source)
-    : window(window),
-      window_state(wm::GetWindowState(window)),
+    : window_state(wm::GetWindowState(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),
       source(source) {
   if (window_state->IsNormalShowState() &&
       window_state->HasRestoreBounds() &&
       window_component == HTCAPTION)
     restore_bounds = window_state->GetRestoreBoundsInScreen();
 }
 
 WindowResizer::Details::~Details() {
 }
 
+aura::Window* WindowResizer::Details::window() const {
+  return window_state ? window_state->window() : NULL;
+}
+
 WindowResizer::WindowResizer() {
 }
 
 WindowResizer::~WindowResizer() {
 }
 
 // static
 int WindowResizer::GetBoundsChangeForWindowComponent(int component) {
   int bounds_change = WindowResizer::kBoundsChange_None;
   switch (component) {
@@ skipping 37 matching lines @@
   // position.  For example, dragging the left edge to the right should stop
   // repositioning the window when the minimize size is reached.
   gfx::Size size = GetSizeForDrag(details, &delta_x, &delta_y);
   gfx::Point origin = GetOriginForDrag(details, delta_x, delta_y);
   gfx::Rect new_bounds(origin, size);
 
   // Sizing has to keep the result on the screen. Note that this correction
   // has to come first since it might have an impact on the origin as well as
   // on the size.
   if (details.bounds_change & kBoundsChange_Resizes) {
-    gfx::Rect work_area =
-        Shell::GetScreen()->GetDisplayNearestWindow(details.window).work_area();
+    gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow(
+        details.window()).work_area();
     aura::Window* dock_container = Shell::GetContainer(
-        details.window->GetRootWindow(),
+        details.window()->GetRootWindow(),
         internal::kShellWindowId_DockedContainer);
     internal::DockedWindowLayoutManager* dock_layout =
         static_cast<internal::DockedWindowLayoutManager*>(
             dock_container->layout_manager());
 
     work_area.Union(dock_layout->docked_bounds());
-    work_area = ScreenAsh::ConvertRectFromScreen(details.window->parent(),
+    work_area = ScreenAsh::ConvertRectFromScreen(details.window()->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.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);
@@ skipping 32 matching lines @@
       // 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())
         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();
+    aura::Window* parent = details.window()->parent();
     gfx::Point passed_location_in_screen(passed_location);
     wm::ConvertPointToScreen(parent, &passed_location_in_screen);
     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 gfx::Display& display =
         Shell::GetScreen()->GetDisplayMatching(near_passed_location);
     aura::Window* dock_container = Shell::GetContainer(
         wm::GetRootWindowMatching(near_passed_location),
         internal::kShellWindowId_DockedContainer);
@@ skipping 71 matching lines @@
   }
   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();
   if (details.bounds_change & kBoundsChange_Resizes) {
-    gfx::Size min_size = details.window->delegate()->GetMinimumSize();
+    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();
   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);
     }
 
     // And don't let the window go bigger than the display.
     int max_width = Shell::GetScreen()->GetDisplayNearestWindow(
-        details.window).bounds().width();
-    gfx::Size max_size = details.window->delegate()->GetMaximumSize();
+        details.window()).bounds().width();
+    gfx::Size max_size = details.window()->delegate()->GetMaximumSize();
     if (max_size.width() != 0)
       max_width = std::min(max_width, max_size.width());
     if (width > max_width) {
       width = max_width;
       *delta_x = -x_multiplier * (details.initial_bounds_in_parent.width() -
                                   max_width);
     }
   }
   return width;
 }
@@ skipping 11 matching lines @@
     // 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);
     }
 
     // And don't let the window go bigger than the display.
     int max_height = Shell::GetScreen()->GetDisplayNearestWindow(
-        details.window).bounds().height();
-    gfx::Size max_size = details.window->delegate()->GetMaximumSize();
+        details.window()).bounds().height();
+    gfx::Size max_size = details.window()->delegate()->GetMaximumSize();
     if (max_size.height() != 0)
       max_height = std::min(max_height, max_size.height());
     if (height > max_height) {
       height = max_height;
       *delta_y = -y_multiplier * (details.initial_bounds_in_parent.height() -
                                   max_height);
     }
   }
   return height;
 }
 
 }  // namespace aura