Attach panel while dragging to bring it in front of other panels.

ash/wm/panels/panel_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/panels/panel_window_resizer.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_types.h"
@@ skipping 87 matching lines @@
     resizer_->CompleteDrag(0);
     resizer_.reset();
   }
 
   // Test dragging the panel slightly, then detaching, and then reattaching
   // dragging out by the vector (dx, dy).
   void DetachReattachTest(int dx, int dy) {
     scoped_ptr<aura::Window> window(
         CreatePanelWindow(gfx::Rect(0, 0, 201, 201)));
     EXPECT_TRUE(window->GetProperty(kPanelAttachedKey));
+    EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id());
     DragStart(window.get());
     gfx::Rect initial_bounds = window->bounds();
 
     // Drag the panel slightly. The window should still be snapped to the
     // launcher.
     DragMove(dx * 5, dy * 5);
     EXPECT_EQ(initial_bounds.x(), window->bounds().x());
     EXPECT_EQ(initial_bounds.y(), window->bounds().y());
 
     // Drag further out and the window should now move to the cursor.
     DragMove(dx * 100, dy * 100);
     EXPECT_EQ(initial_bounds.x() + dx * 100, window->bounds().x());
     EXPECT_EQ(initial_bounds.y() + dy * 100, window->bounds().y());
 
     // The panel should be detached when the drag completes.
     DragEnd();
     EXPECT_FALSE(window->GetProperty(kPanelAttachedKey));
+    EXPECT_EQ(internal::kShellWindowId_WorkspaceContainer,
+              window->parent()->id());
 
     DragStart(window.get());
     // Drag the panel down.
     DragMove(dx * -95, dy * -95);
     // Release the mouse and the panel should be reattached.
     DragEnd();
 
     // The panel should be reattached and have snapped to the launcher.
     EXPECT_TRUE(window->GetProperty(kPanelAttachedKey));
     EXPECT_EQ(initial_bounds.x(), window->bounds().x());
     EXPECT_EQ(initial_bounds.y(), window->bounds().y());
+    EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id());
   }
 
   void TestWindowOrder(const std::vector<aura::Window*>& window_order) {
     Launcher* launcher = Launcher::ForPrimaryDisplay();
     int panel_index = model_->FirstPanelIndex();
     EXPECT_EQ((int)(panel_index + window_order.size()), model_->item_count());
     for (std::vector<aura::Window*>::const_iterator iter =
          window_order.begin(); iter != window_order.end();
          ++iter, ++panel_index) {
       LauncherID id = launcher->delegate()->GetIDByWindow(*iter);
@@ skipping 68 matching lines @@
                            shell->GetPrimaryRootWindow());
   DetachReattachTest(-1, 0);
 }
 
 TEST_F(PanelWindowResizerTest, PanelDetachReattachTop) {
   ash::Shell* shell = ash::Shell::GetInstance();
   shell->SetShelfAlignment(SHELF_ALIGNMENT_TOP, shell->GetPrimaryRootWindow());
   DetachReattachTest(0, 1);
 }
 
+TEST_F(PanelWindowResizerTest, DragMovesToPanelLayer) {
+  scoped_ptr<aura::Window> window(CreatePanelWindow(gfx::Rect(0, 0, 201, 201)));
+  DragStart(window.get());
+  DragMove(0, -100);
+  DragEnd();
+  EXPECT_EQ(internal::kShellWindowId_WorkspaceContainer,
+            window->parent()->id());
+
+  // While moving the panel window should be moved to the panel container.
+  DragStart(window.get());
+  DragMove(20, 0);
+  EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id());
+  DragEnd();
+
+  // When dropped it should return to the default container.
+  EXPECT_EQ(internal::kShellWindowId_WorkspaceContainer,
+            window->parent()->id());
+}
+
 TEST_F(PanelWindowResizerTest, DragReordersPanelsHorizontal) {
   DragAlongShelfReorder(-1, 0);
 }
 
 TEST_F(PanelWindowResizerTest, DragReordersPanelsVertical) {
   ash::Shell* shell = ash::Shell::GetInstance();
   shell->SetShelfAlignment(SHELF_ALIGNMENT_LEFT, shell->GetPrimaryRootWindow());
   DragAlongShelfReorder(0, -1);
 }
 
 }  // namespace internal
 }  // namespace ash