Attempt 3 at a better touch tabstrip. There is still a bunch to do,

chrome/browser/ui/views/tabs/touch_tab_strip_layout.h

Index: chrome/browser/ui/views/tabs/touch_tab_strip_layout.h
diff --git a/chrome/browser/ui/views/tabs/touch_tab_strip_layout.h b/chrome/browser/ui/views/tabs/touch_tab_strip_layout.h
new file mode 100644
index 0000000000000000000000000000000000000000..4516bb253463a1f98c94f33fe70baba5c56d465b
--- /dev/null
+++ b/chrome/browser/ui/views/tabs/touch_tab_strip_layout.h
@@ -0,0 +1,214 @@
+// 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.
+
+#ifndef CHROME_BROWSER_UI_VIEWS_TABS_TOUCH_TAB_STRIP_LAYOUT_H_
+#define CHROME_BROWSER_UI_VIEWS_TABS_TOUCH_TAB_STRIP_LAYOUT_H_
+#pragma once
+
+#include "base/basictypes.h"
+#include "ui/gfx/size.h"
+#include "ui/views/view_model.h"
+
+namespace views {
+class ViewModel;
+}
+
+// TouchTabStripLayout is used by TabStrip in touch mode. TouchTabStripLayout is
+// responsible for managing the bounds of the tabs. TouchTabStripLayout differs
+// from the normal layout in that it stacks tabs. Stacked tabs are tabs placed
+// nearly on top of each other, and if enough consecutive stacked tabs exist
+// they are placed on top of each other. Normally stacked tabs are placed after
+// mini-tabs, or at the end of the tabstrip, but during dragging tabs may be
+// stacked before or after the active tab.
+class TouchTabStripLayout {
+ public:
+  static const int kAddTypeMini   = 1 << 0;
+  static const int kAddTypeActive = 1 << 1;
+
+  // |size| is the size for tabs, |padding| the padding between consecutive
+  // tabs, |stacked_padding| the padding between stacked tabs,
+  // |max_stacked_count| the maximum number of consecutive tabs that can be
+  // stacked before they are placed on top of each other, |view_model| is the
+  // ViewModel the bounds of the tabs are placed in.
+  TouchTabStripLayout(const gfx::Size& size,
+                      int padding,
+                      int stacked_padding,
+                      int max_stacked_count,
+                      views::ViewModel* view_model);
+  ~TouchTabStripLayout();
+
+  // Sets the x-coordinate the normal tabs start at as well as the mini-tab
+  // count. This is only useful if the mini-tab count or x-coordinate change.
+  void SetXAndMiniCount(int x, int mini_tab_count);
+
+  // Sets the width available for sizing the tabs to.
+  void SetWidth(int width);
+
+  int width() const { return width_; }
+
+  // Sets the index of the active tab.
+  void SetActiveIndex(int index);
+
+  // Drags the active tab.
+  void DragActiveTab(int delta);
+
+  // Adds a new tab at the specified index. |add_types| is a bitmask of
+  // kAddType*. |start_x| is the new x-coordinate non-mini tabs start at.
+  void AddTab(int index, int add_types, int start_x);
+
+  // Removes the tab at the specified index. |start_x| is the new x-coordinate
+  // normal tabs start at, and |old_x| the old x-coordinate of the tab. It is
+  // expected that the ViewModel hash been updated at the time this is invoked.
+  void RemoveTab(int index, int start_x, int old_x);
+
+  // Moves the tab from |from| to |to|. |new_active_index| is the index of the
+  // currently active tab.
+  void MoveTab(int from,
+               int to,
+               int new_active_index,
+               int start_x,
+               int mini_tab_count);
+
+  // Returns the active index as used by this class. The active index dictates
+  // stacking and what tabs are visible. As mini-tabs are never stacked,
+  // TouchTabStripLayout forces the active index to be in the normal tabs.
+  int active_index() const {
+    return active_index_ < mini_tab_count_ ? mini_tab_count_ : active_index_;
+  }
+
+ private:
+  friend class TouchTabStripLayoutTest;
+
+  // Sets the x-coordinate normal tabs start at, width mini-tab count and
+  // active index at once.
+  void Reset(int x, int width, int mini_tab_count, int active_index);
+
+  // Resets to an ideal layout state.
+  void ResetToIdealState();
+
+  // Returns the x-coordinate for the active tab constrained by the current tab
+  // counts.
+  int ConstrainActiveX(int x) const;
+
+  // Reset the bounds of the active tab (based on ConstrainActiveX()) and resets
+  // the bounds of the remaining tabs by way of LayoutUsingCurrent*.
+  void SetActiveBoundsAndLayoutFromActiveTab();
+
+  // Sets the bounds of the tabs after |index| relative to the position of the
+  // tab at |index|. Each tab is placed |tab_offset()| pixels after the previous
+  // tab, stacking as necessary.
+  void LayoutByTabOffsetAfter(int index);
+
+  // Same as LayoutByTabOffsetAfter(), but iterates toward
+  // |mini_tab_count_|.
+  void LayoutByTabOffsetBefore(int index);
+
+  // Similar to LayoutByTabOffsetAfter(), but uses the current x-coordinate
+  // if possible.
+  void LayoutUsingCurrentAfter(int index);
+  void LayoutUsingCurrentBefore(int index);
+
+  // Used when the tabs are stacked at one side. The remaining tabs are stacked
+  // against the |active_index()|. |delta| is the amount of space to resize the
+  // the tabs by.
+  void ExpandTabsBefore(int index, int delta);
+  void ExpandTabsAfter(int index, int delta);
+
+  // Adjusts the stacked tabs so that if there are more than
+  // |max_stacked_count_| tabs, the set > max_stacked_count_ have an
+  // x-coordinate of |x_|. Similarly those at the end have the same x-coordinate
+  // and are pushed all the way to the right.
+  void AdjustStackedTabs();
+  void AdjustLeadingStackedTabs();
+  void AdjustTrailingStackedTabs();
+
+  // Sets the bounds of the tab at |index|.
+  void SetIdealBoundsAt(int index, int x);
+
+  // Returns the min x-coordinate for the sepcified index. This is calculated
+  // assuming all the tabs before |index| are stacked.
+  int GetMinX(int index) const;
+
+  // Returns the max x-coordinage for the speficifed index. This is calculated
+  // assuming all the tabs after |index| are stacked.
+  int GetMaxX(int index) const;
+
+  // Returns the max x-coordinate for the tab at |index|. This is relative
+  // to the |active_index()| and is only useful when the active tab is pushed
+  // against the right side.
+  int GetMaxXCompressed(int index) const;
+
+  // Returns the min x-coordinate for the tab at |index|. This is relative
+  // to the |active_index()| and is only useful when the active tab is pushed
+  // against the left side.
+  int GetMinXCompressed(int index) const;
+
+  // Width needed to display |count| tabs.
+  int width_for_count(int count) const {
+    return count == 0 ? 0 :
+        (count * size_.width()) + (std::max(count - 1, 0) * padding_);
+  }
+
+  // Padding needed for |count| stacked tabs.
+  int stacked_padding_for_count(int count) const {
+    return std::min(count, max_stacked_count_) * stacked_padding_;
+  }
+
+  // Max stacked padding.
+  int max_stacked_width() const {
+    return stacked_padding_ * max_stacked_count_;
+  }
+
+  int ideal_x(int index) const { return view_model_->ideal_bounds(index).x(); }
+
+  // Returns true if some of the tabs need to be stacked.
+  bool requires_stacking() const {
+    return tab_count() != mini_tab_count_ &&
+        x_ + width_for_count(tab_count() - mini_tab_count_) > width_;
+  }
+
+  // Number of tabs.
+  int tab_count() const { return view_model_->view_size(); }
+
+  // Number of normal (non-mini) tabs.
+  int normal_tab_count() const { return tab_count() - mini_tab_count_; }
+
+  // Distance between one tab to the next.
+  int tab_offset() const { return size_.width() + padding_; }
+
+#if !defined(NDEBUG)
+  std::string BoundsString() const;
+#endif
+
+  // Size of tabs.
+  const gfx::Size size_;
+
+  // Padding between tabs.
+  const int padding_;
+
+  // Padding between stacked tabs.
+  const int stacked_padding_;
+
+  // Max number of stacked tabs.
+  const int max_stacked_count_;
+
+  // Where bounds are placed. This is owned by TabStrip.
+  views::ViewModel* view_model_;
+
+  // x-coordinate normal tabs start at.
+  int x_;
+
+  // Available width.
+  int width_;
+
+  // Number of mini-tabs.
+  int mini_tab_count_;
+
+  // Index of the active tab.
+  int active_index_;
+
+  DISALLOW_COPY_AND_ASSIGN(TouchTabStripLayout);
+};
+
+#endif  // CHROME_BROWSER_UI_VIEWS_TABS_TOUCH_TAB_STRIP_LAYOUT_H_