Re-landing this. Originally landed as http://codereview.chromium.org/1001003 but reverted due to reliability crashes.

Re-landing so I can see what those crashes are. Please do not revert without informing me.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/1655010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45065 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 4 deletions

diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h
index 1e5b361..0ed69d0 100644
--- a/chrome/browser/views/frame/browser_view.h
+++ b/chrome/browser/views/frame/browser_view.h
@@ -155,7 +155,7 @@ class BrowserView : public BrowserBubbleHost,
   bool IsTabStripVisible() const;
 
   // Returns true if the vertical tabstrip is in use.
-  bool UsingSideTabs() const;
+  bool UseVerticalTabs() const;
 
   // Returns true if the profile associated with this Browser window is
   // off the record.
@@ -321,6 +321,7 @@ class BrowserView : public BrowserBubbleHost,
   virtual void Cut();
   virtual void Copy();
   virtual void Paste();
+  virtual void ToggleTabStripMode();
 
   // Overridden from BrowserWindowTesting:
   virtual BookmarkBarView* GetBookmarkBarView() const;
@@ -394,9 +395,10 @@ class BrowserView : public BrowserBubbleHost,
   // override to implemnet different layout pocily.
   virtual views::LayoutManager* CreateLayoutManager() const;
 
-  // Returns a new TabStrip for the browser view. A subclass may
-  // override to return a different TabStrip implementation.
-  virtual BaseTabStrip* CreateTabStrip(TabStripModel* tab_strip_model);
+  // Initializes a new TabStrip for the browser view. This can be performed
+  // multiple times over the life of the browser, and is run when the display
+  // mode for the tabstrip changes from horizontal to vertical.
+  void InitTabStrip(TabStripModel* tab_strip_model);
 
   // Browser window related initializations.
   virtual void Init();