| 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 94a0b3f090135df68b6fc809e395aade3bed7d5d..ae43200c2621b75063631a0331f58f84827bd35e 100644
|
| --- a/ash/wm/workspace/workspace_window_resizer_unittest.cc
|
| +++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc
|
| @@ -4,7 +4,6 @@
|
|
|
| #include "ash/common/wm/workspace/workspace_window_resizer.h"
|
|
|
| -#include "ash/common/ash_switches.h"
|
| #include "ash/common/shelf/shelf_constants.h"
|
| #include "ash/common/shelf/wm_shelf.h"
|
| #include "ash/common/wm/window_positioning_utils.h"
|
| @@ -1483,11 +1482,6 @@ TEST_F(WorkspaceWindowResizerTest, PhantomSnapMaxSize) {
|
| window_->SetProperty(aura::client::kResizeBehaviorKey,
|
| ui::mojom::kResizeBehaviorCanResize |
|
| ui::mojom::kResizeBehaviorCanMaximize);
|
| -
|
| - // Enable docking for this test.
|
| - base::CommandLine::ForCurrentProcess()->AppendSwitch(
|
| - ash::switches::kAshEnableDockedWindows);
|
| -
|
| {
|
| // With max size not set we get a phantom window controller for dragging off
|
| // the right hand side.
|
| @@ -1502,15 +1496,14 @@ TEST_F(WorkspaceWindowResizerTest, PhantomSnapMaxSize) {
|
| resizer->RevertDrag();
|
| }
|
| {
|
| - // With max size defined, we get no phantom window for snapping but we still
|
| - // get a phantom window (docking guide).
|
| + // With max size defined, we get no phantom window for snapping.
|
| window_->SetBounds(gfx::Rect(0, 0, 400, 200));
|
| delegate_.set_max_size(gfx::Size(400, 200));
|
|
|
| std::unique_ptr<WindowResizer> resizer(
|
| CreateResizerForTest(window_.get(), gfx::Point(), HTCAPTION));
|
| resizer->Drag(CalculateDragPoint(*resizer, 801, 0), 0);
|
| - EXPECT_TRUE(snap_phantom_window_controller());
|
| + EXPECT_FALSE(snap_phantom_window_controller());
|
| resizer->RevertDrag();
|
| }
|
| {
|
|
|