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

ash/wm/workspace/workspace_window_resizer_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/wm/workspace/workspace_window_resizer.h"
 
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_controller.h"
 #include "ash/root_window_controller.h"
@@ skipping 527 matching lines @@
   EXPECT_EQ("20,366 100x134", window3_->bounds().ToString());
 }
 
 
 // Assertions around dragging to the left/right edge of the screen.
 TEST_F(WorkspaceWindowResizerTest, Edge) {
   int bottom =
       ScreenAsh::GetDisplayWorkAreaBoundsInParent(window_.get()).bottom();
   window_->SetBounds(gfx::Rect(20, 30, 50, 60));
   {
+    // Construct a SnapSizer to get the expected bounds when snapped left.
+    internal::SnapSizer sizer(window_.get(),
+                              gfx::Point(),
+                              internal::SnapSizer::LEFT_EDGE,
+                              internal::SnapSizer::STEP_NO);
+
     scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
         window_.get(), gfx::Point(), HTCAPTION,
         aura::client::WINDOW_MOVE_SOURCE_MOUSE, empty_windows()));
     ASSERT_TRUE(resizer.get());
     resizer->Drag(CalculateDragPoint(*resizer, 0, 10), 0);
     resizer->CompleteDrag(0);
-    EXPECT_EQ("0,0 720x" + base::IntToString(bottom),
+    EXPECT_EQ(sizer.target_bounds().ToString(),
               window_->bounds().ToString());
     ASSERT_TRUE(GetRestoreBoundsInScreen(window_.get()));
     EXPECT_EQ("20,30 50x60",
               GetRestoreBoundsInScreen(window_.get())->ToString());
   }
   // Try the same with the right side.
   {
+    // Construct a SnapSizer to get the expected bounds when snapped right.
+    internal::SnapSizer sizer(window_.get(),
+                              gfx::Point(),
+                              internal::SnapSizer::RIGHT_EDGE,
+                              internal::SnapSizer::STEP_NO);
+
     scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
         window_.get(), gfx::Point(), HTCAPTION,
         aura::client::WINDOW_MOVE_SOURCE_MOUSE, empty_windows()));
     ASSERT_TRUE(resizer.get());
     resizer->Drag(CalculateDragPoint(*resizer, 800, 10), 0);
     resizer->CompleteDrag(0);
-    EXPECT_EQ("80,0 720x" + base::IntToString(bottom),
+    EXPECT_EQ(sizer.target_bounds().ToString(),
               window_->bounds().ToString());
     ASSERT_TRUE(GetRestoreBoundsInScreen(window_.get()));
     EXPECT_EQ("20,30 50x60",
               GetRestoreBoundsInScreen(window_.get())->ToString());
   }
 
   // Test if the restore bounds is correct in multiple displays.
   ClearRestoreBounds(window_.get());
 
   if (!SupportsMultipleDisplays())
@@ skipping 555 matching lines @@
       window_.get(), gfx::Point(), HTCAPTION,
       aura::client::WINDOW_MOVE_SOURCE_MOUSE, empty_windows()));
   ASSERT_TRUE(resizer.get());
   // Ctrl + drag the window to new poistion by adding (10, 12) to its origin,
   // the window should move to the exact position.
   resizer->Drag(CalculateDragPoint(*resizer, 10, 12), 0);
   resizer->CompleteDrag(ui::EF_CONTROL_DOWN);
   EXPECT_EQ("106,124 320x160", window_->bounds().ToString());
 }
 
-// Check that only usable sizes get returned by the resizer.
-TEST_F(WorkspaceWindowResizerTest, TestProperSizerResolutions) {
-  // Check that we have the correct work area resolution which fits our
-  // expected test result.
-  gfx::Rect work_area(ScreenAsh::GetDisplayWorkAreaBoundsInParent(
-                          window_.get()));
-  EXPECT_EQ(800, work_area.width());
-
-  window_->SetBounds(gfx::Rect(96, 112, 320, 160));
-  scoped_ptr<SnapSizer> resizer(new SnapSizer(
-      window_.get(),
-      gfx::Point(),
-      SnapSizer::LEFT_EDGE,
-      SnapSizer::OTHER_INPUT));
-  ASSERT_TRUE(resizer.get());
-  shelf_layout_manager()->SetAutoHideBehavior(
-      SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
-
-  // Check that the list is declining and contains elements of the
-  // ideal size list [1280, 1024, 768, 640] as well as 50% and 90% the work
-  // area.
-  gfx::Rect rect = resizer->GetTargetBoundsForSize(0);
-  EXPECT_EQ("0,0 720x597", rect.ToString());
-  rect = resizer->GetTargetBoundsForSize(1);
-  EXPECT_EQ("0,0 640x597", rect.ToString());
-  rect = resizer->GetTargetBoundsForSize(2);
-  EXPECT_EQ("0,0 400x597", rect.ToString());
-  shelf_layout_manager()->SetAutoHideBehavior(
-      SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
-  rect = resizer->GetTargetBoundsForSize(0);
-  EXPECT_EQ("0,0 720x552", rect.ToString());
-  rect = resizer->GetTargetBoundsForSize(1);
-  EXPECT_EQ("0,0 640x552", rect.ToString());
-  rect = resizer->GetTargetBoundsForSize(2);
-  EXPECT_EQ("0,0 400x552", rect.ToString());
-}
-
 // Verifies that a dragged window will restore to its pre-maximized size.
 TEST_F(WorkspaceWindowResizerTest, RestoreToPreMaximizeCoordinates) {
   window_->SetBounds(gfx::Rect(0, 0, 1000, 1000));
   SetRestoreBoundsInScreen(window_.get(), gfx::Rect(96, 112, 320, 160));
   scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
       window_.get(), gfx::Point(), HTCAPTION,
       aura::client::WINDOW_MOVE_SOURCE_MOUSE, empty_windows()));
   ASSERT_TRUE(resizer.get());
   // Drag the window to new position by adding (10, 10) to original point,
   // the window should get restored.
@@ skipping 778 matching lines @@
   RunAnimationTillComplete(phantom_controller->animation_.get());
 
   // Hide phantom controller. Both widgets should close.
   phantom_controller->Hide();
   EXPECT_FALSE(phantom_controller->phantom_widget_);
   EXPECT_FALSE(phantom_controller->phantom_widget_start_);
 }
 
 }  // namespace internal
 }  // namespace ash