Refactor intra-strip panel drags by introducing PanelDragController.

chrome/browser/ui/panels/docked_panel_strip.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/docked_panel_strip.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 165 matching lines @@
                      panel),
           base::TimeDelta::FromMilliseconds(PanelManager::AdjustTimeInterval(
               kMoveNewPanelToOverflowDelayMs)));
     }
 #endif
     panel->Initialize(gfx::Rect(x, y, width, height));
   }
 
   // Set panel properties for this strip.
   panel->SetAppIconVisibility(true);
-  panel->set_draggable(!panel->has_temporary_layout());
   panel->ApplyVisualStyleForStrip();
 
   if (panel->has_temporary_layout())
     panels_in_temporary_layout_.insert(panel);
   else
     panels_.push_back(panel);
 }
 
 int DockedPanelStrip::GetMaxPanelWidth() const {
   return static_cast<int>(display_area_.width() * kPanelMaxWidthFactor);
@@ skipping 48 matching lines @@
     return false;
 
   if (panel->expansion_state() != Panel::EXPANDED)
     DecrementMinimizedPanels();
 
   panels_.erase(iter);
   panel_manager_->OnPanelRemoved(panel);
   return true;
 }
 
-void DockedPanelStrip::StartDragging(Panel* panel) {
+bool DockedPanelStrip::CanDragPanel(Panel* panel) const {
+  // Only the panels having temporary layout can't be dragged.
+  return !panel->has_temporary_layout();
+}
+
+void DockedPanelStrip::StartDraggingPanel(Panel* panel) {
+  DCHECK(!dragging_panel_);
+
   dragging_panel_iterator_ = find(panels_.begin(), panels_.end(), panel);
   DCHECK(dragging_panel_iterator_ != panels_.end());
 
   dragging_panel_ = panel;
   dragging_panel_bounds_ = panel->GetBounds();
   dragging_panel_original_x_ = dragging_panel_bounds_.x();
 }
 
-void DockedPanelStrip::Drag(int delta_x) {
+void DockedPanelStrip::DragPanel(int delta_x, int delta_y) {
   DCHECK(dragging_panel_);
 
   if (!delta_x)
     return;
 
   // Moves this panel to the dragging position.
   gfx::Rect new_bounds(dragging_panel_->GetBounds());
   new_bounds.set_x(new_bounds.x() + delta_x);
   dragging_panel_->SetPanelBounds(new_bounds);
 
@@ skipping 74 matching lines @@
     *dragging_panel_iterator_ = current_panel;
     *current_panel_iterator = dragging_panel_;
     dragging_panel_iterator_ = current_panel_iterator;
   }
 
   // Updates the potential final position of dragging panel as the result of
   // swapping with panels on its right.
   dragging_panel_bounds_.set_x(current_panel_left_boundary);
 }
 
-void DockedPanelStrip::EndDragging(bool cancelled) {
+void DockedPanelStrip::EndDraggingPanel(bool cancelled) {
   DCHECK(dragging_panel_);
 
   if (cancelled)
-    Drag(dragging_panel_original_x_ - dragging_panel_->GetBounds().x());
+    DragPanel(dragging_panel_original_x_ - dragging_panel_->GetBounds().x(), 0);
   else
     dragging_panel_->SetPanelBounds(dragging_panel_bounds_);
 
   dragging_panel_ = NULL;
 
   DelayedRemove();
 }
 
 void DockedPanelStrip::OnPanelExpansionStateChanged(Panel* panel) {
   gfx::Size size = panel->restored_size();
@@ skipping 378 matching lines @@
 
   // Start from the bottom to avoid reshuffling.
   for (Panels::reverse_iterator iter = panels_copy.rbegin();
        iter != panels_copy.rend(); ++iter)
     (*iter)->Close();
 }
 
 bool DockedPanelStrip::is_dragging_panel() const {
   return dragging_panel_ != NULL;
 }