Refactor intra-strip panel drags by introducing PanelDragController.

chrome/browser/ui/panels/panel_browsertest.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 "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/net/url_request_mock_util.h"
@@ skipping 752 matching lines @@
                  DRAG_ACTION_BEGIN | DRAG_ACTION_CANCEL);
   }
 
   panel1->Close();
   panel2->Close();
   panel3->Close();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, NotDraggable) {
   Panel* panel = CreatePanel("panel");
-  panel->set_draggable(false);
+  // This is used to simulate making a docked panel not draggable.
+  panel->set_has_temporary_layout(true);
   Panel* panel2 = CreatePanel("panel2");
 
   scoped_ptr<NativePanelTesting> panel_testing(
       NativePanelTesting::Create(panel->native_panel()));
   gfx::Rect bounds = panel->GetBounds();
   panel_testing->PressLeftMouseButtonTitlebar(bounds.origin());
   EXPECT_EQ(bounds.x(), panel->GetBounds().x());
   panel_testing->DragTitlebar(-50, 10);
   EXPECT_EQ(bounds.x(), panel->GetBounds().x());
   panel_testing->FinishDragTitlebar();
   EXPECT_EQ(bounds.x(), panel->GetBounds().x());
 
+  // Reset the simulation hack so that the panel can be closed correctly.
+  panel->set_has_temporary_layout(false);
   panel->Close();
   panel2->Close();
 }
 
+IN_PROC_BROWSER_TEST_F(PanelBrowserTest, CloseDraggingPanel) {
+  PanelManager* panel_manager = PanelManager::GetInstance();
+
+  // Create one panel.
+  Panel* panel = CreatePanel("panel");
+
+  // Start dragging the panel.
+  scoped_ptr<NativePanelTesting> panel_testing(
+      NativePanelTesting::Create(panel->native_panel()));
+  panel_testing->PressLeftMouseButtonTitlebar(panel->GetBounds().origin());
+  panel_testing->DragTitlebar(-51, 102);
+
+  // Closing the panel while drag in progress will keep the panel intact.
+  panel->Close();

[jennb, 2012/02/17 21:28:45]

Close is async so this will always continue with num_panels unchanged. May have
to rethink how to test delayed removal.

[jianli, 2012/02/17 23:52:56]

ditto.

+  EXPECT_EQ(1, panel_manager->num_panels());
+
+  // It should be closed right after the drag ends.
+  panel_testing->FinishDragTitlebar();
+  EXPECT_EQ(0, panel_manager->num_panels());
+}
+
 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, CreateSettingsMenu) {
   TestCreateSettingsMenuForExtension(
       FILE_PATH_LITERAL("extension1"), Extension::EXTERNAL_POLICY_DOWNLOAD,
       "", "");
   TestCreateSettingsMenuForExtension(
       FILE_PATH_LITERAL("extension2"), Extension::INVALID,
       "http://home", "options.html");
 }
 
 // Flaky: http://crbug.com/105445
@@ skipping 1199 matching lines @@
   // position when tall panel brings up its titlebar.
   CloseWindowAndWait(panel1->browser());
   EXPECT_EQ(balloon_bottom_after_tall_panel_titlebar_up,
             GetBalloonBottomPosition(balloon));
 
   // Closing the remaining tall panel should move the notification balloon back
   // to its original position.
   CloseWindowAndWait(panel2->browser());
   EXPECT_EQ(original_balloon_bottom, GetBalloonBottomPosition(balloon));
 }