Implement automatic layout and stacking for docked windows

ash/wm/dock/docked_window_resizer_unittest.cc

 // Copyright (c) 2013 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/dock/docked_window_resizer.h"
 
 #include "ash/ash_switches.h"
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/root_window_controller.h"
@@ skipping 206 matching lines @@
     if (edge == DOCKED_EDGE_LEFT)
       dx += window->GetRootWindow()->bounds().x() - initial_bounds.x();
     else if (edge == DOCKED_EDGE_RIGHT)
       dx += window->GetRootWindow()->bounds().right() - initial_bounds.right();
     DragMove(dx, window_type_ == aura::client::WINDOW_TYPE_PANEL ? 0 : dy);
     EXPECT_EQ(CorrectContainerIdDuringDrag(UNDOCKED), window->parent()->id());
     // Release the mouse and the panel should be attached to the dock.
     DragEnd();
 
     // x-coordinate can get adjusted by snapping or sticking.
-    // y-coordinate should not change by possible docking.
-    EXPECT_EQ(initial_bounds.y() + dy, window->GetBoundsInScreen().y());
+    // y-coordinate could be changed by possible automatic layout if docked.
+    if (window->parent()->id() != internal::kShellWindowId_DockedContainer)
+      EXPECT_EQ(initial_bounds.y() + dy, window->GetBoundsInScreen().y());
   }
 
   bool test_panels() const {
     return window_type_ == aura::client::WINDOW_TYPE_PANEL;
   }
 
  private:
   scoped_ptr<WindowResizer> resizer_;
   LauncherModel* model_;
   aura::client::WindowType window_type_;
@@ skipping 208 matching lines @@
 
   // Both windows should be attached and snapped to the right edge.
   EXPECT_EQ(w1->GetRootWindow()->bounds().right(),
             w1->GetBoundsInScreen().right());
   EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
 
   EXPECT_EQ(w2->GetRootWindow()->bounds().right(),
             w2->GetBoundsInScreen().right());
   EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id());
 
-  // Detach by dragging left (should get undocked)
+  // Detach by dragging left (should get undocked).
   ASSERT_NO_FATAL_FAILURE(DragStart(w2.get()));
-  DragMove(-32, -10);
+  // Drag up as well to avoid attaching panels to launcher shelf.
+  DragMove(-32, -100);
   // Release the mouse and the window should be no longer attached to the edge.
   DragEnd();
 
   // The first window should be still docked.
   EXPECT_EQ(w1->GetRootWindow()->bounds().right(),
             w1->GetBoundsInScreen().right());
   EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
 
   // The second window should be floating on a workspace again.
   EXPECT_EQ(w2->GetRootWindow()->bounds().right() - 32,
@@ skipping 174 matching lines @@
   // The second window should be still docked.
   EXPECT_EQ(w2->GetRootWindow()->bounds().right(),
             w2->GetBoundsInScreen().right());
   EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id());
 
   // Detach by dragging left more (should get undocked).
   ASSERT_NO_FATAL_FAILURE(DragStartAtOffsetFromwindowOrigin(
       w2.get(),
       w2->bounds().width()/2 + 10,
       0));
-  DragMove(-(w2->bounds().width()/2 + 20), 10);
+  // Drag up as well to avoid attaching panels to launcher shelf.
+  DragMove(-(w2->bounds().width()/2 + 20), -100);
   // Release the mouse and the window should be no longer attached to the edge.
   DragEnd();
 
   // The second window should be floating on a workspace again.
   EXPECT_EQ(w2->GetRootWindow()->bounds().right() -
             (w2->bounds().width()/2 + 20),
             w2->GetBoundsInScreen().right());
   EXPECT_EQ(internal::kShellWindowId_WorkspaceContainer, w2->parent()->id());
   // Dock width should be set to remaining single docked window.
   EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
@@ skipping 313 matching lines @@
                                                               HTLEFT));
   DragMove(-kResizeSpan3, 0);
   DragEnd();
   EXPECT_EQ(previous_width + kResizeSpan3, w1->bounds().width());
   EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
   // Docked area should be as wide as the second window - the first is too wide.
   EXPECT_EQ(w2->bounds().width(), manager->docked_width_);
 
   // Undock the second window. Docked area should shrink to its minimum size.
   ASSERT_NO_FATAL_FAILURE(DragStart(w2.get()));
-  DragMove(-40, 10);
+  // Drag up as well to avoid attaching panels to launcher shelf.
+  DragMove(-40, -100);
   // Alignment set to "RIGHT" since we have another window docked.
   EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, manager->alignment_);
   // Release the mouse and the window should be no longer attached to the edge.
   DragEnd();
   EXPECT_EQ(internal::kShellWindowId_WorkspaceContainer, w2->parent()->id());
   // Dock should get shrunk to minimum size.
   EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, manager->alignment_);
   EXPECT_EQ(manager->kMinDockWidth, manager->docked_width_);
   // The first window should be still docked.
   EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
@@ skipping 50 matching lines @@
   }
 }
 
 // Tests run twice - on both panels and normal windows
 INSTANTIATE_TEST_CASE_P(NormalOrPanel,
                         DockedWindowResizerTest,
                         testing::Values(aura::client::WINDOW_TYPE_NORMAL,
                                         aura::client::WINDOW_TYPE_PANEL));
 }  // namespace internal
 }  // namespace ash