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

chrome/browser/ui/window_sizer/window_sizer_ash.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 "chrome/browser/ui/window_sizer/window_sizer.h"
 
 #include "ash/shell.h"
 #include "ash/wm/window_positioner.h"
 #include "ash/wm/window_state.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/gfx/screen.h"
 
 bool WindowSizer::GetBrowserBoundsAsh(gfx::Rect* bounds,
                                       ui::WindowShowState* show_state) const {
   if (!browser_ ||
       browser_->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH)
     return false;
 
+  bool determined = false;
   if (bounds->IsEmpty()) {
     if (browser_->is_type_tabbed()) {
       GetTabbedBrowserBoundsAsh(bounds, show_state);
-      return true;
-    }
-
-    if (browser_->is_trusted_source()) {
+      determined = true;
+    } else if (browser_->is_trusted_source()) {
       // For trusted popups (v1 apps and system windows), do not use the last
       // active window bounds, only use saved or default bounds.
       if (!GetSavedWindowBounds(bounds, show_state))
         GetDefaultWindowBounds(GetTargetDisplay(gfx::Rect()), bounds);
-      return true;
+      determined = true;
+    } else {
+      // In Ash, prioritize the last saved |show_state|. If you have questions
+      // or comments about this behavior please contact oshima@chromium.org.
+      if (state_provider_) {
+        gfx::Rect ignored_bounds, ignored_work_area;
+        state_provider_->GetPersistentState(&ignored_bounds,
+                                            &ignored_work_area,
+                                            show_state);
+      }
     }
-
-    // In Ash, prioritize the last saved |show_state|. If you have questions
-    // or comments about this behavior please contact oshima@chromium.org.
-    if (state_provider_) {
-      gfx::Rect ignored_bounds, ignored_work_area;
-      state_provider_->GetPersistentState(&ignored_bounds,
-                                          &ignored_work_area,
-                                          show_state);
+  } else {
+    // In case of a popup with an 'unspecified' location in ash, we are
+    // looking for a good screen location. We are interpreting (0,0) as an
+    // unspecified location.
+    if (browser_->is_type_popup() && bounds->origin().IsOrigin()) {

[msw, 2014/08/05 16:44:38]

nit: combine this into an "else if" at line 43.

[varkha, 2014/08/05 17:55:23]

Done.

+      *bounds = ash::Shell::GetInstance()->window_positioner()->
+          GetPopupPosition(*bounds);
+      determined = true;
     }
-    return false;
   }
 
-  // In case of a popup with an 'unspecified' location in ash, we are
-  // looking for a good screen location. We are interpreting (0,0) as an
-  // unspecified location.
-  if (browser_->is_type_popup() && bounds->origin().IsOrigin()) {
-    *bounds = ash::Shell::GetInstance()->window_positioner()->
-        GetPopupPosition(*bounds);
-    return true;
+  if (*show_state == ui::SHOW_STATE_DEFAULT) {

[msw, 2014/08/05 16:44:38]

If this new behavior also applies to popup browser windows, popups can now open
themselves in a maximized state (by specifying any bounds >= the work area
bounds). Consider excluding popup windows from this new behavior, or I'd highly
encourage your to ping the security team to ensure that isn't problematic.

[varkha, 2014/08/05 17:55:23]

Makes sense to restrict this only to tabbed browsers. Done and thanks for the
suggestion!

+    gfx::Display display = screen_->GetDisplayMatching(*bounds);
+    gfx::Rect work_area = display.work_area();
+    bounds->AdjustToFit(work_area);
+    if (*bounds == work_area) {
+      // A window that occupies the whole work area gets maximized.
+      // |bounds| returned here become the restore bounds once the window
+      // gets maximized after this method returns. Return a sensible default
+      // in order to make restored state visibly different from maximized.
+      *show_state = ui::SHOW_STATE_MAXIMIZED;
+      *bounds = ash::WindowPositioner::GetDefaultWindowBounds(display);
+      determined = true;
+    }
   }
-  return false;
+  return determined;
 }
 
 void WindowSizer::GetTabbedBrowserBoundsAsh(
     gfx::Rect* bounds_in_screen,
     ui::WindowShowState* show_state) const {
   DCHECK(show_state);
   DCHECK(bounds_in_screen);
   DCHECK(browser_->is_type_tabbed());
   DCHECK(bounds_in_screen->IsEmpty());
 
@@ skipping 32 matching lines @@
       browser_->window() ? browser_->window()->GetNativeWindow() : NULL;
 
   ash::WindowPositioner::GetBoundsAndShowStateForNewWindow(
       screen_,
       browser_window,
       is_saved_bounds,
       passed_show_state,
       bounds_in_screen,
       show_state);
 }