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

chrome/browser/ui/window_sizer/window_sizer_ash_unittest.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/scoped_target_root_window.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm/window_positioner.h"
@@ skipping 873 matching lines @@
                                p1600x1200), ui::SHOW_STATE_MAXIMIZED);
 
   // The popup should favor the initial show state over the command line.
   EXPECT_EQ(GetWindowShowState(ui::SHOW_STATE_NORMAL,
                                ui::SHOW_STATE_NORMAL,
                                BOTH,
                                browser_popup->browser(),
                                p1600x1200), ui::SHOW_STATE_NORMAL);
 }
 
-// Test that the target root window is used as the destionation of
+TEST_F(WindowSizerAshTest, DefaultStateBecomesMaximized) {
+  gfx::Rect display_bounds = ash::Shell::GetInstance()->GetScreen()->
+      GetPrimaryDisplay().bounds();
+  gfx::Rect specified_bounds = display_bounds;
+
+  // Make a window bigger than the display work area.

[msw, 2014/07/31 04:03:24]

Users can still make windows excessively large and span multiple displays,
right? Perhaps a test ensuring that's still possible would be good.

[varkha, 2014/08/01 14:18:34]

No, with ash they cannot. The biggest a window is allowed to be is its root
window size. There's no support for windows spanning multiple root windows.

[msw, 2014/08/01 16:24:47]

But windows could span multiple displays on Windows desktop, last I knew. That's
not something this CL breaks, is it? Does the window_sizer.cc change belong in
window_sizer_ash.cc, or should there be a new window_sizer_unittest.cc or
window_sizer_common_unittest.cc test?

[varkha, 2014/08/01 21:00:24]

I've moved the behavior in window_sizer_ash.cc so Windows behavior should be
unaffected.

+  specified_bounds.Inset(-20, -20);
+  ui::WindowShowState show_state = ui::SHOW_STATE_DEFAULT;
+  gfx::Rect bounds;
+  WindowSizer::GetBrowserWindowBoundsAndShowState(
+      std::string(), specified_bounds, NULL, &bounds, &show_state);
+  // The window should start maximized with its restore bounds shrunken.
+  EXPECT_EQ(ui::SHOW_STATE_MAXIMIZED, show_state);
+  EXPECT_NE(display_bounds.ToString(), bounds.ToString());
+  EXPECT_TRUE(display_bounds.Contains(bounds));
+
+  // Make a window smaller than the display work area.
+  specified_bounds.Inset(100, 100);
+  show_state = ui::SHOW_STATE_DEFAULT;
+  WindowSizer::GetBrowserWindowBoundsAndShowState(
+      std::string(), specified_bounds, NULL, &bounds, &show_state);
+  // The window should start in default state.
+  EXPECT_EQ(ui::SHOW_STATE_DEFAULT, show_state);
+  EXPECT_EQ(specified_bounds.ToString(), bounds.ToString());
+}
+
+// Test that the target root window is used as the destination of
 // the non browser window. This differ from PersistedBoundsCase
 // in that this uses real ash shell implementations + StateProvider
 // TargetDisplayProvider, rather than mocks.
 TEST_F(WindowSizerAshTest, DefaultBoundsInTargetDisplay) {
   if (!SupportsMultipleDisplays() || !chrome::ShouldOpenAshOnStartup())
     return;
   UpdateDisplay("500x500,600x600");
   {
     aura::Window* first_root =
         ash::Shell::GetAllRootWindows()[0];
@@ skipping 36 matching lines @@
       trusted_popup_create_params));
   // Trusted popup windows should follow the saved show state and ignore the
   // last show state.
   EXPECT_EQ(ui::SHOW_STATE_DEFAULT,
             GetWindowShowState(ui::SHOW_STATE_DEFAULT,
                                ui::SHOW_STATE_NORMAL,
                                BOTH,
                                trusted_popup->browser(),
                                p1600x1200));
 }