Only support left/right maximizing at 50% width when the --ash-enable-alternate-caption-button

ash/wm/workspace/snap_sizer_unittest.cc

Index: ash/wm/workspace/snap_sizer_unittest.cc
diff --git a/ash/wm/workspace/snap_sizer_unittest.cc b/ash/wm/workspace/snap_sizer_unittest.cc
index f3879c44fb93a4d55b62a2a81a551c3bda603b00..984973cb73546844a07bf64b0ac61f655b9ca2a1 100644
--- a/ash/wm/workspace/snap_sizer_unittest.cc
+++ b/ash/wm/workspace/snap_sizer_unittest.cc
@@ -4,10 +4,12 @@
 
 #include "ash/wm/workspace/snap_sizer.h"
 
+#include "ash/ash_switches.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
+#include "base/command_line.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
@@ -97,4 +99,123 @@ TEST_F(SnapSizerTest, MinimumSize) {
   EXPECT_FALSE(ash::wm::CanSnapWindow(window.get()));
 }
 
+// Test that repeadedly calling SnapSizer::SnapWindow() steps through the ideal
+// widths in descending order as well as 90% and 50% of the work area's width.
+TEST_F(SnapSizerTest, StepThroughSizes) {
+  if (!SupportsHostWindowResize())
+    return;
+
+  UpdateDisplay("0+0-1024x800");
+  const gfx::Rect kWorkAreaBounds =
+      ash::Shell::GetScreen()->GetPrimaryDisplay().work_area();
+
+  scoped_ptr<aura::Window> window(
+      CreateTestWindowInShellWithBounds(gfx::Rect(100, 100, 100, 100)));
+
+  // The first width should be 1024 * 0.9 because the larger ideal widths
+  // (1280, 1024) > 1024 * 0.9.
+  SnapSizer::SnapWindow(window.get(), SnapSizer::LEFT_EDGE);
+  gfx::Rect expected = gfx::Rect(kWorkAreaBounds.x(),
+                                 kWorkAreaBounds.y(),
+                                 921,

[James Cook, 2013/09/10 20:49:08]

optional idea: what do you think of using kWorkAreaBounds * 9 / 10 here?  harrym
had a hard time getting tests fixed when we made some changes that altered the
work area size.  Admittedly the width of the work area is unlikely to change,
but it might save us from updating this test later.

[pkotwicz, 2013/09/11 16:31:26]

Done.

+                                 kWorkAreaBounds.height());
+  EXPECT_EQ(expected.ToString(), window->GetBoundsInScreen().ToString());
+
+  SnapSizer::SnapWindow(window.get(), SnapSizer::LEFT_EDGE);
+  expected.set_width(768);
+  EXPECT_EQ(expected.ToString(), window->GetBoundsInScreen().ToString());
+
+  SnapSizer::SnapWindow(window.get(), SnapSizer::LEFT_EDGE);
+  expected.set_width(640);
+  EXPECT_EQ(expected.ToString(), window->GetBoundsInScreen().ToString());
+
+  SnapSizer::SnapWindow(window.get(), SnapSizer::LEFT_EDGE);
+  expected.set_width(512);
+  EXPECT_EQ(expected.ToString(), window->GetBoundsInScreen().ToString());
+
+  // Wrap around.
+  SnapSizer::SnapWindow(window.get(), SnapSizer::LEFT_EDGE);
+  expected.set_width(921);
+  EXPECT_EQ(expected.ToString(), window->GetBoundsInScreen().ToString());
+}
+
+// Tests the SnapSizer's target bounds when resizing is disabled.
+TEST_F(SnapSizerTest, Default) {
+  if (!SupportsHostWindowResize())
+    return;
+
+  scoped_ptr<aura::Window> window(
+      CreateTestWindowInShellWithBounds(gfx::Rect(100, 100, 100, 100)));
+  SnapSizer sizer(window.get(), gfx::Point(), SnapSizer::LEFT_EDGE,
+      SnapSizer::OTHER_INPUT);
+
+  // For small workspace widths, we should snap to 90% of the workspace width
+  // because it is the largest width the window can snap to.
+  UpdateDisplay("0+0-800x600");
+  sizer.SelectDefaultSizeAndDisableResize();
+
+  gfx::Rect expected = ash::Shell::GetScreen()->GetPrimaryDisplay().work_area();
+  expected.set_width(720);
+  EXPECT_EQ(expected.ToString(),
+            ScreenAsh::ConvertRectToScreen(window->parent(),
+                                           sizer.target_bounds()).ToString());
+
+  // If the largest width the window can snap to is between 1024 and 1280, we
+  // should snap to 1024.
+  UpdateDisplay("0+0-1280x800");
+  sizer.SelectDefaultSizeAndDisableResize();
+  EXPECT_EQ(1024, sizer.target_bounds().width());
+
+  // We should snap to a width of 50% of the work area it is the largest width
+  // the window can snap to.
+  UpdateDisplay("0+0-2560x1080");
+  sizer.SelectDefaultSizeAndDisableResize();
+  EXPECT_EQ(1280, sizer.target_bounds().width());
+}

[James Cook, 2013/09/10 20:49:08]

Nice test coverage.

+
+// Test that the window only snaps to 50% of the work area width when using the
+// alternate caption button style.
+TEST_F(SnapSizerTest, AlternateFrameCaptionButtonStyle) {
+  if (!SupportsHostWindowResize())
+    return;
+
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      ash::switches::kAshEnableAlternateFrameCaptionButtonStyle);
+  ASSERT_TRUE(ash::switches::UseAlternateFrameCaptionButtonStyle());
+
+  UpdateDisplay("0+0-800x600");
+  const gfx::Rect kWorkAreaBounds =
+      ash::Shell::GetScreen()->GetPrimaryDisplay().work_area();
+
+  scoped_ptr<aura::Window> window(
+      CreateTestWindowInShellWithBounds(gfx::Rect(100, 100, 100, 100)));
+
+  SnapSizer::SnapWindow(window.get(), SnapSizer::LEFT_EDGE);
+  gfx::Rect expected = gfx::Rect(kWorkAreaBounds.x(),
+                                 kWorkAreaBounds.y(),
+                                 kWorkAreaBounds.width() / 2,
+                                 kWorkAreaBounds.height());
+  EXPECT_EQ(expected.ToString(), window->GetBoundsInScreen().ToString());
+
+  // Because a window can only be snapped to one size when using the alternate
+  // caption button style, a second call to SnapSizer::SnapWindow() should have

[James Cook, 2013/09/10 20:49:08]

Random UX question not related to this CL.  Have we considered using different
snap behavior for keyboard vs. mouse triggered snap?  I could imagine a
power-user feature that lets you cycle through different window widths by
hitting the snap key multiple times.

It might be kind of bizarre to start with 50% left then get wider if you snap
left again again, though.

[pkotwicz, 2013/09/11 16:31:26]

I agree that this may be a good idea. I think that power users are well
represented within ChromeOS users at Google so I am confident I will get a bug
assigned to me if a power user wants the feature.
(If you want the feature please file a bug and I will ping kuscher@ on his
thoughts)

+  // no effect.
+  SnapSizer::SnapWindow(window.get(), SnapSizer::LEFT_EDGE);
+  EXPECT_EQ(expected.ToString(), window->GetBoundsInScreen().ToString());
+
+  // It should still be possible to switch a window from being snapped to the
+  // left edge to being snapped to the right edge.
+  SnapSizer::SnapWindow(window.get(), SnapSizer::RIGHT_EDGE);
+  expected.set_x(kWorkAreaBounds.right() - expected.width());
+  EXPECT_EQ(expected.ToString(), window->GetBoundsInScreen().ToString());
+
+  // If resizing is disabled, the window should be snapped to 50% too.
+  SnapSizer sizer(window.get(), gfx::Point(), SnapSizer::RIGHT_EDGE,
+      SnapSizer::OTHER_INPUT);
+  sizer.SelectDefaultSizeAndDisableResize();
+  EXPECT_EQ(expected.ToString(),
+            ScreenAsh::ConvertRectToScreen(window->parent(),
+                                           sizer.target_bounds()).ToString());
+}
+
 }  // namespace ash