Remove docked windows entirely in M59.

ash/wm/toplevel_window_event_handler_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/toplevel_window_event_handler.h"
 
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm/workspace_controller.h"
 #include "ash/public/cpp/shell_window_ids.h"
@@ skipping 56 matching lines @@
     w1->set_id(1);
     w1->Init(ui::LAYER_TEXTURED);
     aura::Window* parent = Shell::GetContainer(Shell::GetPrimaryRootWindow(),
                                                kShellWindowId_DefaultContainer);
     parent->AddChild(w1);
     w1->SetBounds(gfx::Rect(0, 0, 100, 100));
     w1->Show();
     return w1;
   }
 
+  aura::Window* CreatePanelWindow(int hittest_code) {
+    TestWindowDelegate* d1 = new TestWindowDelegate(hittest_code);
+    aura::Window* w1 = new aura::Window(d1);
+    w1->SetType(ui::wm::WINDOW_TYPE_PANEL);
+    w1->set_id(1);
+    w1->Init(ui::LAYER_TEXTURED);
+    aura::Window* parent = Shell::GetContainer(Shell::GetPrimaryRootWindow(),
+                                               kShellWindowId_PanelContainer);
+    parent->AddChild(w1);
+    w1->SetBounds(gfx::Rect(0, 0, 100, 100));
+    w1->Show();
+    return w1;
+  }
+
   void DragFromCenterBy(aura::Window* window, int dx, int dy) {
     ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), window);
     generator.DragMouseBy(dx, dy);
   }
 
   void TouchDragFromCenterBy(aura::Window* window, int dx, int dy) {
     ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), window);
     generator.PressMoveAndReleaseTouchBy(dx, dy);
   }
 
@@ skipping 40 matching lines @@
   const gfx::Size size = w1->bounds().size();
   wm::WindowState* window_state = ash::wm::GetWindowState(w1.get());
   ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), w1.get());
 
   // Explicitly enable window position auto management, and expect it to be
   // restored after drag completes.
   window_state->set_window_position_managed(true);
   generator.PressLeftButton();
   aura::client::WindowMoveClient* move_client =
       aura::client::GetWindowMoveClient(w1->GetRootWindow());
-  // generator.PressLeftButton();
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&ContinueAndCompleteDrag, base::Unretained(&generator),
                  base::Unretained(window_state), base::Unretained(w1.get())));
   EXPECT_EQ(aura::client::MOVE_SUCCESSFUL,
             move_client->RunMoveLoop(w1.get(), gfx::Vector2d(100, 100),
                                      aura::client::WINDOW_MOVE_SOURCE_MOUSE));
   // Window position auto manage property should be restored to true.
   EXPECT_TRUE(window_state->window_position_managed());
   // Position should have been offset by 100,100.
@@ skipping 13 matching lines @@
             move_client->RunMoveLoop(w1.get(), gfx::Vector2d(100, 100),
                                      aura::client::WINDOW_MOVE_SOURCE_MOUSE));
   // Window position auto manage property should be restored to true.
   EXPECT_FALSE(window_state->window_position_managed());
   // Position should have been offset by 100,100.
   EXPECT_EQ("200,200", w1->bounds().origin().ToString());
   // Size should remain the same.
   EXPECT_EQ(size.ToString(), w1->bounds().size().ToString());
 }
 
-namespace {
-
-class CancelDragObserver : public aura::WindowObserver {
- public:
-  CancelDragObserver() {}
-  ~CancelDragObserver() override {}
-
-  void OnWindowHierarchyChanging(const HierarchyChangeParams& params) override {
-    aura::client::CaptureClient* client =
-        aura::client::GetCaptureClient(params.target->GetRootWindow());
-    client->SetCapture(nullptr);
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(CancelDragObserver);
-};
-
-}  // namespace
-
 // Cancelling drag while starting window drag should not crash.
 TEST_F(ToplevelWindowEventHandlerTest, CancelWhileDragStart) {
-  std::unique_ptr<aura::Window> w1(CreateWindow(HTCAPTION));
-  CancelDragObserver observer;
-  w1->AddObserver(&observer);
+  std::unique_ptr<aura::Window> w1(CreatePanelWindow(HTCAPTION));
   gfx::Point origin = w1->bounds().origin();
-  DragFromCenterBy(w1.get(), 100, 100);
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), w1.get());
+  generator.PressLeftButton();
+  generator.MoveMouseBy(100, 100);
+  generator.PressKey(ui::VKEY_ESCAPE, 0);
+  generator.ReleaseLeftButton();
   EXPECT_EQ(origin, w1->bounds().origin());
-  w1->RemoveObserver(&observer);
 }
 
 TEST_F(ToplevelWindowEventHandlerTest, BottomRight) {
   std::unique_ptr<aura::Window> w1(CreateWindow(HTBOTTOMRIGHT));
   gfx::Point position = w1->bounds().origin();
   DragFromCenterBy(w1.get(), 100, 100);
   // Position should not have changed.
   EXPECT_EQ(position.ToString(), w1->bounds().origin().ToString());
   // Size should have increased by 100,100.
   EXPECT_EQ(gfx::Size(200, 200).ToString(), w1->bounds().size().ToString());
@@ skipping 614 matching lines @@
   display_manager()->SetLayoutForCurrentDisplays(builder.Build());
 
   const gfx::Size initial_window_size(330, 230);
   std::unique_ptr<aura::Window> w1(CreateTestWindowInShellWithDelegateAndType(
       new TestWindowDelegate(HTCAPTION), ui::wm::WINDOW_TYPE_NORMAL, 0,
       gfx::Rect(initial_window_size)));
 
   // Snap the window to the right.
   wm::WindowState* window_state = wm::GetWindowState(w1.get());
   ASSERT_TRUE(window_state->CanSnap());
-  const wm::WMEvent event(wm::WM_EVENT_CYCLE_SNAP_DOCK_RIGHT);
+  const wm::WMEvent event(wm::WM_EVENT_CYCLE_SNAP_RIGHT);
   window_state->OnWMEvent(&event);
   ASSERT_TRUE(window_state->IsSnapped());
 
   // Drag the window to the secondary display.
   ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), w1.get());
   generator.DragMouseTo(472, -462);
 
   // Expect the window is no longer snapped and its size was restored to the
   // initial size.
   EXPECT_FALSE(window_state->IsSnapped());
   EXPECT_EQ(initial_window_size.ToString(), w1->bounds().size().ToString());
 
   // The window is now fully contained in the secondary display.
   EXPECT_TRUE(display_manager()->GetSecondaryDisplay().bounds().Contains(
       w1->GetBoundsInScreen()));
 }
 
 // Showing the resize shadows when the mouse is over the window edges is tested
 // in resize_shadow_and_cursor_test.cc
 
 }  // namespace test
 }  // namespace ash