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

chrome/browser/views/frame/browser_frame_win.cc

Index: chrome/browser/views/frame/browser_frame_win.cc
===================================================================
--- chrome/browser/views/frame/browser_frame_win.cc	(revision 42174)
+++ chrome/browser/views/frame/browser_frame_win.cc	(working copy)
@@ -69,6 +69,9 @@
   return this;
 }
 
+void BrowserFrameWin::TabStripCreated(BaseTabStrip* tabstrip) {
+}
+
 int BrowserFrameWin::GetMinimizeButtonOffset() const {
   TITLEBARINFOEX titlebar_info;
   titlebar_info.cbSize = sizeof(TITLEBARINFOEX);
@@ -124,14 +127,6 @@
   browser_frame_view_->PaintTabStripShadow(canvas);
 }
 
-void BrowserFrameWin::TabStripDisplayModeChanged() {
-  UpdateDWMFrame();
-  // We need to relayout only after the window frame has had a chance to update
-  // the size/position of its controls (e.g. minimize/maximize/close) so that
-  // the tabstrip can layout at its correct bounds.
-  GetRootView()->Layout();
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrame, views::WindowWin overrides:
 
@@ -299,7 +294,7 @@
     // In maximized mode, we only have a titlebar strip of glass, no side/bottom
     // borders.
     if (!browser_view_->IsFullscreen()) {
-      if (browser_view_->UseVerticalTabs()) {
+      if (browser_view_->UsingSideTabs()) {
         margins.cxLeftWidth +=
             GetBoundsForTabStrip(browser_view_->tabstrip()).right();
         margins.cyTopHeight += GetSystemMetrics(SM_CYSIZEFRAME);
@@ -314,7 +309,7 @@
   DwmExtendFrameIntoClientArea(GetNativeView(), &margins);
 
   DWORD window_style = GetWindowLong(GWL_STYLE);
-  if (browser_view_->UseVerticalTabs()) {
+  if (browser_view_->UsingSideTabs()) {
     if (window_style & WS_CAPTION)
       SetWindowLong(GWL_STYLE, window_style & ~WS_CAPTION);
   } else {