Makes a window that has been resized to maximized bounds, then maximized and then restored shrink

ash/wm/default_state.cc

Index: ash/wm/default_state.cc
diff --git a/ash/wm/default_state.cc b/ash/wm/default_state.cc
index 0fd3070dcfcb39ec6b4d369c4619ff16ecc87f1e..e575970891dcaf4467dd72719f85fe79c2e219eb 100644
--- a/ash/wm/default_state.cc
+++ b/ash/wm/default_state.cc
@@ -511,10 +511,22 @@ void DefaultState::UpdateBoundsFromState(WindowState* window_state,
     case WINDOW_STATE_TYPE_NORMAL: {
       gfx::Rect work_area_in_parent =
           ScreenUtil::GetDisplayWorkAreaBoundsInParent(window_state->window());
-      if (window_state->HasRestoreBounds())
+      if (window_state->HasRestoreBounds()) {
         bounds_in_parent = window_state->GetRestoreBoundsInParent();
-      else
+        // Check if the |window|'s restored size is bigger than the working area
+        // This may happen if a window was resized to maimized bounds or if the

[msw, 2014/08/05 01:42:58]

nit: s/maimized/maximized/

[varkha, 2014/08/05 15:00:20]

Done.

+        // display resolution changed while the window was maximized.
+        if (previous_state_type == WINDOW_STATE_TYPE_MAXIMIZED &&
+            bounds_in_parent.width() >= work_area_in_parent.width() &&
+            bounds_in_parent.height() >= work_area_in_parent.height()) {
+          // Inset the bounds slightly so that they are not exactly same as
+          // work area bounds and it is easier to resize the window.

[msw, 2014/08/05 01:42:58]

nit: "the work area bounds"

[varkha, 2014/08/05 15:00:20]

Done.

+          bounds_in_parent = work_area_in_parent;
+          bounds_in_parent.Inset(10, 10, 10, 10);
+        }
+      } else {
         bounds_in_parent = window->bounds();
+      }
       // Make sure that part of the window is always visible.
       AdjustBoundsToEnsureMinimumWindowVisibility(
           work_area_in_parent, &bounds_in_parent);