Gets tab dragging to work in touch mode.

chrome/browser/ui/views/tabs/touch_tab_strip_layout.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/views/tabs/touch_tab_strip_layout.h"
 
 #include <stdio.h>
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
@@ skipping 91 matching lines @@
       width_ - size_.width() : ideal_x(index + 1);
   SetIdealBoundsAt(active_index(), ConstrainActiveX(active_x));
   LayoutByTabOffsetAfter(active_index());
   LayoutByTabOffsetBefore(active_index());
   AdjustStackedTabs();
 }
 
 void TouchTabStripLayout::RemoveTab(int index, int start_x, int old_x) {
   if (index == active_index_)
     active_index_ = std::min(active_index_, tab_count() - 1);
-  else if (index > active_index_)
+  else if (index < active_index_)
     active_index_--;
   bool removed_mini_tab = index < mini_tab_count_;
   if (removed_mini_tab) {
     mini_tab_count_--;
     DCHECK_GE(mini_tab_count_, 0);
   }
   int delta = start_x - x_;
   x_ = start_x;
   if (!requires_stacking()) {
     ResetToIdealState();
     return;
   }
   if (removed_mini_tab) {
     for (int i = mini_tab_count_; i < tab_count(); ++i)
       SetIdealBoundsAt(i, ideal_x(i) + delta);
   }
   SetActiveBoundsAndLayoutFromActiveTab();
   AdjustStackedTabs();
 }
 
 void TouchTabStripLayout::MoveTab(int from,
                                   int to,
                                   int new_active_index,
                                   int start_x,
                                   int mini_tab_count) {
   x_ = start_x;
   mini_tab_count_ = mini_tab_count;
   active_index_ = new_active_index;
+  if (!requires_stacking() || tab_count() == mini_tab_count_) {
+    ResetToIdealState();
+    return;
+  }
   SetIdealBoundsAt(active_index(), ConstrainActiveX(ideal_x(active_index())));
   LayoutByTabOffsetAfter(active_index());
   LayoutByTabOffsetBefore(active_index());
   AdjustStackedTabs();
 }
 
+bool TouchTabStripLayout::IsStacked(int index) const {
+  if (index == active_index() || tab_count() == mini_tab_count_)
+    return false;
+  if (index > active_index())
+    return ideal_x(index) != ideal_x(index - 1) + tab_offset();
+  return ideal_x(index + 1) != ideal_x(index) + tab_offset();
+}
+
 void TouchTabStripLayout::Reset(int x,
                                 int width,
                                 int mini_tab_count,
                                 int active_index) {
   x_ = x;
   width_ = width;
   mini_tab_count_ = mini_tab_count;
   active_index_ = active_index;
   ResetToIdealState();
 }
@@ skipping 220 matching lines @@
       result += " ";
     if (i == active_index())
       result += "[";
     result += base::IntToString(view_model_->ideal_bounds(i).x());
     if (i == active_index())
       result += "]";
   }
   return result;
 }
 #endif