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

chrome/browser/views/frame/browser_frame_win.cc

 // Copyright (c) 2006-2008 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_frame_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 
 #include <set>
@@ skipping 51 matching lines @@
   WindowWin::Init(NULL, gfx::Rect());
 }
 
 BrowserFrameWin::~BrowserFrameWin() {
 }
 
 views::Window* BrowserFrameWin::GetWindow() {
   return this;
 }
 
+void BrowserFrameWin::TabStripCreated(BaseTabStrip* tabstrip) {
+}
+
 int BrowserFrameWin::GetMinimizeButtonOffset() const {
   TITLEBARINFOEX titlebar_info;
   titlebar_info.cbSize = sizeof(TITLEBARINFOEX);
   SendMessage(GetNativeView(), WM_GETTITLEBARINFOEX, 0, (WPARAM)&titlebar_info);
 
   CPoint minimize_button_corner(titlebar_info.rgrect[2].left,
                                 titlebar_info.rgrect[2].top);
   MapWindowPoints(HWND_DESKTOP, GetNativeView(), &minimize_button_corner, 1);
 
   return minimize_button_corner.x;
@@ skipping 35 matching lines @@
 }
 
 views::View* BrowserFrameWin::GetFrameView() const {
   return browser_frame_view_;
 }
 
 void BrowserFrameWin::PaintTabStripShadow(gfx::Canvas* canvas) {
   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:
 
 gfx::Insets BrowserFrameWin::GetClientAreaInsets() const {
   // Use the default client insets for an opaque frame or a glass popup/app
   // frame.
   if (!GetNonClientView()->UseNativeFrame() ||
       !browser_view_->IsBrowserTypeNormal()) {
     return WindowWin::GetClientAreaInsets();
   }
@@ skipping 147 matching lines @@
     // become semi-transparent over any glass area.
     if (!IsMaximized() && !IsFullscreen()) {
       margins.cxLeftWidth = kClientEdgeThickness + 1;
       margins.cxRightWidth = kClientEdgeThickness + 1;
       margins.cyBottomHeight = kClientEdgeThickness + 1;
       margins.cyTopHeight = kClientEdgeThickness + 1;
     }
     // 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);
       } else {
         margins.cyTopHeight =
             GetBoundsForTabStrip(browser_view_->tabstrip()).bottom();
       }
     }
   } else {
     // For popup and app windows we want to use the default margins.
   }
   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 {
     if (!(window_style & WS_CAPTION))
       SetWindowLong(GWL_STYLE, window_style | WS_CAPTION);
   }
 }