| Index: ash/wm/workspace/multi_window_resize_controller_unittest.cc
|
| diff --git a/ash/wm/workspace/multi_window_resize_controller_unittest.cc b/ash/wm/workspace/multi_window_resize_controller_unittest.cc
|
| index e528438c54ecb1882d7f80093bef04eabdce9ed1..96ea0cd0648fbf2ca459a4c3073b10964ceb6c4d 100644
|
| --- a/ash/wm/workspace/multi_window_resize_controller_unittest.cc
|
| +++ b/ash/wm/workspace/multi_window_resize_controller_unittest.cc
|
| @@ -10,6 +10,7 @@
|
| #include "ash/wm/workspace_controller.h"
|
| #include "ash/wm/workspace_controller_test_helper.h"
|
| #include "ash/wm/workspace/workspace_event_handler_test_helper.h"
|
| +#include "ui/aura/client/aura_constants.h"
|
| #include "ui/aura/test/event_generator.h"
|
| #include "ui/aura/test/test_window_delegate.h"
|
| #include "ui/aura/window.h"
|
| @@ -126,6 +127,24 @@ TEST_F(MultiWindowResizeControllerTest, BasicTests) {
|
| EXPECT_FALSE(HasPendingHide());
|
| }
|
|
|
| +// Make sure that a non resizable window has no impact.
|
| +TEST_F(MultiWindowResizeControllerTest, NonResizableTest) {
|
| + aura::test::TestWindowDelegate delegate1;
|
| + scoped_ptr<aura::Window> w1(
|
| + CreateTestWindow(&delegate1, gfx::Rect(0, 0, 100, 100)));
|
| + delegate1.set_window_component(HTRIGHT);
|
| + aura::test::TestWindowDelegate delegate2;
|
| + scoped_ptr<aura::Window> w2(
|
| + CreateTestWindow(&delegate2, gfx::Rect(100, 0, 100, 100)));
|
| + delegate2.set_window_component(HTRIGHT);
|
| + w2->SetProperty(aura::client::kCanResizeKey, false);
|
| + aura::test::EventGenerator generator(w1->GetRootWindow());
|
| + generator.MoveMouseTo(99, 50);
|
| + EXPECT_FALSE(HasPendingShow());
|
| + EXPECT_FALSE(IsShowing());
|
| + EXPECT_FALSE(HasPendingHide());
|
| +}
|
| +
|
| // Makes sure deleting a window hides.
|
| TEST_F(MultiWindowResizeControllerTest, DeleteWindow) {
|
| aura::test::TestWindowDelegate delegate1;
|
|
|