Refactor intra-strip panel drags by introducing PanelDragController.

chrome/browser/ui/panels/panel_manager.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 "chrome/browser/ui/panels/panel_manager.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/fullscreen.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/panels/detached_panel_strip.h"
 #include "chrome/browser/ui/panels/docked_panel_strip.h"
 #include "chrome/browser/ui/panels/overflow_panel_strip.h"
+#include "chrome/browser/ui/panels/panel_drag_controller.h"
 #include "chrome/browser/ui/panels/panel_mouse_watcher.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "ui/gfx/screen.h"
 
 namespace {
 const int kOverflowStripThickness = 26;
@@ skipping 31 matching lines @@
         extension_id == std::string("eggnbpckecmjlblplehfpjjdhhidfdoj");
   }
 
   return true;
 }
 
 PanelManager::PanelManager()
     : panel_mouse_watcher_(PanelMouseWatcher::Create()),
       auto_sizing_enabled_(true),
       is_full_screen_(false) {
+  detached_strip_.reset(new DetachedPanelStrip(this));
   docked_strip_.reset(new DockedPanelStrip(this));
   overflow_strip_.reset(new OverflowPanelStrip(this));
+  drag_controller_.reset(new PanelDragController());
   auto_hiding_desktop_bar_ = AutoHidingDesktopBar::Create(this);
   OnDisplayChanged();
 }
 
 PanelManager::~PanelManager() {
 }
 
 void PanelManager::OnDisplayChanged() {
 #if defined(OS_MACOSX)
   // On OSX, panels should be dropped all the way to the bottom edge of the
@@ skipping 74 matching lines @@
   if (num_panels() == 0)
     full_screen_mode_timer_.Stop();
 #endif
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_REMOVED,
       content::Source<Panel>(panel),
       content::NotificationService::NoDetails());
 }
 
-void PanelManager::StartDragging(Panel* panel) {
-  docked_strip_->StartDragging(panel);
+bool PanelManager::CanDrag(Panel* panel) const {
+  return panel->panel_strip()->CanDragPanel(panel);
 }
 
-void PanelManager::Drag(int delta_x) {
-  docked_strip_->Drag(delta_x);
+void PanelManager::StartDragging(Panel* panel) {
+  drag_controller_->StartDragging(panel);
+}
+
+void PanelManager::Drag(int delta_x, int delta_y) {
+  drag_controller_->Drag(delta_x, delta_y);
 }
 
 void PanelManager::EndDragging(bool cancelled) {
-  docked_strip_->EndDragging(cancelled);
+  drag_controller_->EndDragging(cancelled);
 }
 
 void PanelManager::OnPanelExpansionStateChanged(Panel* panel) {
   docked_strip_->OnPanelExpansionStateChanged(panel);
 }
 
 void PanelManager::OnPreferredWindowSizeChanged(
     Panel* panel, const gfx::Size& preferred_window_size) {
   if (!auto_sizing_enabled_) {
     LOG(INFO) << "Resizing auto-resizable Panels is not supported yet.";
@@ skipping 55 matching lines @@
   Layout();
 }
 
 void PanelManager::OnAutoHidingDesktopBarVisibilityChanged(
     AutoHidingDesktopBar::Alignment alignment,
     AutoHidingDesktopBar::Visibility visibility) {
   docked_strip_->OnAutoHidingDesktopBarVisibilityChanged(alignment, visibility);
 }
 
 void PanelManager::CloseAll() {
+  DCHECK(!drag_controller_->dragging_panel());
+
+  detached_strip_->CloseAll();
   docked_strip_->CloseAll();
   overflow_strip_->CloseAll();
 }
 
 int PanelManager::num_panels() const {
-  return docked_strip_->num_panels() + overflow_strip_->num_panels();
+  return detached_strip_->num_panels() +
+         docked_strip_->num_panels() +
+         overflow_strip_->num_panels();
 }
 
 std::vector<Panel*> PanelManager::panels() const {

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

Need to include detached panels here.

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

Done.

   std::vector<Panel*> panels;
   for (DockedPanelStrip::Panels::const_iterator iter =
            docked_strip_->panels().begin();
        iter != docked_strip_->panels().end(); ++iter)
     panels.push_back(*iter);
   for (OverflowPanelStrip::Panels::const_iterator iter =
            overflow_strip_->panels().begin();
        iter != overflow_strip_->panels().end(); ++iter)
     panels.push_back(*iter);
   return panels;
 }
 
 void PanelManager::SetMouseWatcher(PanelMouseWatcher* watcher) {
   panel_mouse_watcher_.reset(watcher);
 }