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;
-
   if (bounds->IsEmpty()) {
     if (browser_->is_type_tabbed()) {
       GetTabbedBrowserBoundsAsh(bounds, show_state);
       return true;
     }
 
     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))
@@ skipping 16 matching lines @@
   // 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;
   }
   return false;
 }
 
+bool WindowSizer::GetBrowserBoundsAshAdjusted(

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

Merge this into GetBrowserBoundsAsh. Its one call site now calls this anyway.

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

Done. Was considering doing that but wanted to see an incremental logic change.
Second opinion helps.

+    gfx::Rect* bounds,
+    ui::WindowShowState* show_state) const {
+  if (!browser_ ||
+      browser_->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH)
+    return false;
+
+  bool determined = GetBrowserBoundsAsh(bounds, show_state);
+
+  if (*show_state == ui::SHOW_STATE_DEFAULT) {
+    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.
+      // |window_bounds| returned here become the restore bounds once the window

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

nit: s/|window_bounds|/|bounds|/ to match the actual parameter name.

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

Done.

+      // 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 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());
 
   ui::WindowShowState passed_show_state = *show_state;
 
@@ skipping 30 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);
 }