| Index: ash/wm/workspace/workspace_window_resizer_unittest.cc
|
| diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc
|
| index 7de57dd0bdec64a505264dfe5ef14c3dd4c871fd..47b3c08f282a2bcf830b20a530e83102a4f5b014 100644
|
| --- a/ash/wm/workspace/workspace_window_resizer_unittest.cc
|
| +++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc
|
| @@ -21,6 +21,7 @@
|
| #include "ash/wm/workspace/phantom_window_controller.h"
|
| #include "base/string_number_conversions.h"
|
| #include "base/stringprintf.h"
|
| +#include "ui/aura/client/aura_constants.h"
|
| #include "ui/aura/root_window.h"
|
| #include "ui/aura/test/test_window_delegate.h"
|
| #include "ui/base/hit_test.h"
|
| @@ -517,6 +518,19 @@ TEST_F(WorkspaceWindowResizerTest, Edge) {
|
| #endif
|
| }
|
|
|
| +// Check that non resizable windows will not get resized.
|
| +TEST_F(WorkspaceWindowResizerTest, NonResizableWindows) {
|
| + window_->SetBounds(gfx::Rect(20, 30, 50, 60));
|
| + window_->SetProperty(aura::client::kCanResizeKey, false);
|
| +
|
| + scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
|
| + window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
|
| + ASSERT_TRUE(resizer.get());
|
| + resizer->Drag(CalculateDragPoint(*resizer, -20, 0), 0);
|
| + resizer->CompleteDrag(0);
|
| + EXPECT_EQ("0,30 50x60", window_->bounds().ToString());
|
| +}
|
| +
|
| // Verifies a window can be moved from the primary display to another.
|
| TEST_F(WorkspaceWindowResizerTest, MAYBE_WindowDragWithMultiDisplays) {
|
| // The secondary display is logically on the right, but on the system (e.g. X)
|
|
|