[Ash] Only snap windows that can maximize.

ash/wm/window_state_unittest.cc

 // Copyright 2014 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/window_state.h"
 
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/wm_event.h"
+#include "ui/aura/client/aura_constants.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 namespace wm {
 namespace {
 
 class AlwaysMaximizeTestState : public WindowState::State {
  public:
   explicit AlwaysMaximizeTestState(WindowStateType initial_state_type)
@@ skipping 96 matching lines @@
   EXPECT_TRUE(window_state->CanSnap());
   const WMEvent snap_right(WM_EVENT_SNAP_RIGHT);
   window_state->OnWMEvent(&snap_right);
   gfx::Rect expected = gfx::Rect(kWorkAreaBounds.x() + 1,
                                  kWorkAreaBounds.y(),
                                  kWorkAreaBounds.width() - 1,
                                  kWorkAreaBounds.height());
   EXPECT_EQ(expected.ToString(), window->GetBoundsInScreen().ToString());
 
   // It should not be possible to snap a window with a maximum size.
-  delegate.set_minimum_size(gfx::Size());
-  delegate.set_maximum_size(gfx::Size(kWorkAreaBounds.width() - 1, INT_MAX));
+  delegate.set_maximum_size(gfx::Size(kWorkAreaBounds.width() - 1, 0));
+  EXPECT_FALSE(window_state->CanSnap());
+  delegate.set_maximum_size(gfx::Size(0, kWorkAreaBounds.height() - 1));
   EXPECT_FALSE(window_state->CanSnap());

[oshima, 2014/09/11 01:00:05]

I probably wasn't clear, sorry:

You should also test:

   delegate.set_maximum_size(gfx::Size());
   window->SetProperty(aura::client::kCanMaximizeKey, false)
   EXPECT_FALSE(window_state->CanSnap());

[jackhou1, 2014/09/11 01:52:43]

Done.

 }
 
 // Test that the minimum size specified by aura::WindowDelegate gets respected.
 TEST_F(WindowStateTest, TestRespectMinimumSize) {
   if (!SupportsHostWindowResize())
     return;
 
   UpdateDisplay("0+0-1024x768");
 
   aura::test::TestWindowDelegate delegate;
@@ skipping 189 matching lines @@
   EXPECT_FALSE(window_state->IsMaximized());
   EXPECT_NE(work_area.ToString(), window->bounds().ToString());
   EXPECT_TRUE(work_area.Contains(window->bounds()));
 }
 
 // TODO(skuhne): Add more unit test to verify the correctness for the restore
 // operation.
 
 }  // namespace wm
 }  // namespace ash