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

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2010 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/views/frame/browser_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 526 matching lines @@
 }
 
 gfx::Rect BrowserView::GetTabStripBounds() const {
   return frame_->GetBoundsForTabStrip(tabstrip_);
 }
 
 bool BrowserView::IsTabStripVisible() const {
   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 {
   return browser_->profile()->IsOffTheRecord();
 }
 
 bool BrowserView::ShouldShowOffTheRecordAvatar() const {
   return IsOffTheRecord() && IsBrowserTypeNormal();
 }
 
@@ skipping 658 matching lines @@
 void BrowserView::Copy() {
   ui_controls::SendKeyPress(GetNativeHandle(), base::VKEY_C, true,
                             false, false);
 }
 
 void BrowserView::Paste() {
   ui_controls::SendKeyPress(GetNativeHandle(), base::VKEY_V, true,
                             false, false);
 }
 
-void BrowserView::ToggleTabStripMode() {
-  InitTabStrip(browser_->tabstrip_model());
-  frame_->TabStripDisplayModeChanged();
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, BrowserWindowTesting implementation:
 
 BookmarkBarView* BrowserView::GetBookmarkBarView() const {
   return bookmark_bar_view_.get();
 }
 
 LocationBarView* BrowserView::GetLocationBarView() const {
   return toolbar_->location_bar();
 }
@@ skipping 397 matching lines @@
 }
 
 void BrowserView::InfoBarSizeChanged(bool is_animating) {
   SelectedTabToolbarSizeChanged(is_animating);
 }
 
 views::LayoutManager* BrowserView::CreateLayoutManager() const {
   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_;
+BaseTabStrip* BrowserView::CreateTabStrip(TabStripModel* model) {
+  if (UsingSideTabs()) {
+    SideTabStrip* tabstrip = new SideTabStrip;
+    tabstrip->SetModel(new BrowserTabStripController(model, tabstrip));
+    return tabstrip;
   }
-
-  TabStrip* tabstrip_as_tabstrip = NULL;
-  BrowserTabStripController* tabstrip_controller = NULL;
-
-  if (UseVerticalTabs()) {
-    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_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_TABSTRIP));
-  AddChildView(tabstrip_);
-
-  if (tabstrip_controller)
-    tabstrip_controller->InitFromModel();
-  else
-    tabstrip_as_tabstrip->InitFromModel();
+  return new TabStrip(model);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, private:
 
 void BrowserView::Init() {
   SetLayoutManager(CreateLayoutManager());
   // Stow a pointer to this object onto the window handle so that we can get
   // at it later when all we have is a native view.
 #if defined(OS_WIN)
   SetProp(GetWidget()->GetNativeView(), kBrowserViewKey, this);
 #else
   g_object_set_data(G_OBJECT(GetWidget()->GetNativeView()),
                     kBrowserViewKey, this);
 #endif
 
   // Start a hung plugin window detector for this browser object (as long as
   // hang detection is not disabled).
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableHangMonitor)) {
     InitHangMonitor();
   }
 
   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_);
   toolbar_->Init(browser_->profile());
   toolbar_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_TOOLBAR));
 
   infobar_container_ = new InfoBarContainer(this);
   AddChildView(infobar_container_);
 
   contents_container_ = new TabContentsContainer;
@@ skipping 476 matching lines @@
       SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
 
   return view;
 }
 #endif
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }