Revert r42156, r42157, r42160. Allow dynamic switching in and out of sidetabs...

chrome/browser/views/frame/browser_view.cc

Index: chrome/browser/views/frame/browser_view.cc
===================================================================
--- chrome/browser/views/frame/browser_view.cc	(revision 42174)
+++ chrome/browser/views/frame/browser_view.cc	(working copy)
@@ -544,8 +544,8 @@
   return browser_->SupportsWindowFeature(Browser::FEATURE_TABSTRIP);
 }
 
-bool BrowserView::UseVerticalTabs() const {
-  return browser_->tabstrip_model()->delegate()->UseVerticalTabs();
+bool BrowserView::UsingSideTabs() const {
+  return SideTabStrip::Visible(browser_->profile());
 }
 
 bool BrowserView::IsOffTheRecord() const {
@@ -1224,11 +1224,6 @@
                             false, false);
 }
 
-void BrowserView::ToggleTabStripMode() {
-  InitTabStrip(browser_->tabstrip_model());
-  frame_->TabStripDisplayModeChanged();
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, BrowserWindowTesting implementation:
 
@@ -1646,32 +1641,13 @@
   return new BrowserViewLayout;
 }
 
-void BrowserView::InitTabStrip(TabStripModel* model) {
-// Throw away the existing tabstrip if we're switching display modes.
-  if (tabstrip_) {
-    tabstrip_->GetParent()->RemoveChildView(tabstrip_);
-    delete tabstrip_;
-  }
-
-  TabStrip* tabstrip_as_tabstrip = NULL;
-  BrowserTabStripController* tabstrip_controller = NULL;
-
-  if (UseVerticalTabs()) {
+BaseTabStrip* BrowserView::CreateTabStrip(TabStripModel* model) {
+  if (UsingSideTabs()) {
     SideTabStrip* tabstrip = new SideTabStrip;
-    tabstrip_controller = new BrowserTabStripController(model, tabstrip);
-    tabstrip->SetModel(tabstrip_controller);
-    tabstrip_ = tabstrip;
-  } else {
-    tabstrip_as_tabstrip = new TabStrip(model);
-    tabstrip_ = tabstrip_as_tabstrip;
+    tabstrip->SetModel(new BrowserTabStripController(model, tabstrip));
+    return tabstrip;
   }
-  tabstrip_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_TABSTRIP));
-  AddChildView(tabstrip_);
-
-  if (tabstrip_controller)
-    tabstrip_controller->InitFromModel();
-  else
-    tabstrip_as_tabstrip->InitFromModel();
+  return new TabStrip(model);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1698,7 +1674,10 @@
   LoadAccelerators();
   SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
 
-  InitTabStrip(browser_->tabstrip_model());
+  tabstrip_ = CreateTabStrip(browser_->tabstrip_model());
+  tabstrip_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_TABSTRIP));
+  AddChildView(tabstrip_);
+  frame_->TabStripCreated(tabstrip_);
 
   toolbar_ = new ToolbarView(browser_.get());
   AddChildView(toolbar_);