Allow dynamic switching in and out of sidetabs mode.

chrome/browser/views/frame/glass_browser_frame_view.cc

Index: chrome/browser/views/frame/glass_browser_frame_view.cc
===================================================================
--- chrome/browser/views/frame/glass_browser_frame_view.cc	(revision 41630)
+++ chrome/browser/views/frame/glass_browser_frame_view.cc	(working copy)
@@ -83,7 +83,7 @@
 
 gfx::Rect GlassBrowserFrameView::GetBoundsForTabStrip(
     BaseTabStrip* tabstrip) const {
-  if (browser_view_->UsingSideTabs()) {
+  if (browser_view_->UseVerticalTabs()) {
     gfx::Size ps = tabstrip->GetPreferredSize();
     return gfx::Rect(0, NonClientTopBorderHeight(), ps.width(),
                      browser_view_->height());
@@ -120,6 +120,9 @@
 }
 
 void GlassBrowserFrameView::PaintTabStripShadow(gfx::Canvas* canvas) {
+  if (!browser_view_->UseVerticalTabs())
+    return;
+
   ThemeProvider* tp = GetThemeProvider();
   SkBitmap* shadow_top = tp->GetBitmapNamed(IDR_SIDETABS_SHADOW_TOP);
   SkBitmap* shadow_middle = tp->GetBitmapNamed(IDR_SIDETABS_SHADOW_MIDDLE);
@@ -242,7 +245,7 @@
   // We'd like to use FrameBorderThickness() here, but the maximized Aero glass
   // frame has a 0 frame border around most edges and a CXSIZEFRAME-thick border
   // at the top (see AeroGlassFrame::OnGetMinMaxInfo()).
-  const int kRestoredHeight = browser_view_->UsingSideTabs() ?
+  const int kRestoredHeight = browser_view_->UseVerticalTabs() ?
       -2 : kNonClientRestoredExtraThickness;
   return GetSystemMetrics(SM_CXSIZEFRAME) + (browser_view_->IsMaximized() ?
       -kTabstripTopShadowThickness : kRestoredHeight);
@@ -274,7 +277,7 @@
 
   // Draw the toolbar background, setting src_y of the paint to the tab
   // strip height as the toolbar background begins at the top of the tabs.
-  int src_y = browser_view_->UsingSideTabs()
+  int src_y = browser_view_->UseVerticalTabs()
       ? TabRenderer::GetMinimumUnselectedSize().height()
       : browser_view_->GetTabStripHeight() - 1;
   canvas->TileImageInt(*theme_toolbar, 0, src_y,
@@ -324,7 +327,7 @@
       tp->GetBitmapNamed(IDR_CONTENT_TOP_LEFT_CORNER)->height();
 
   gfx::Rect client_area_bounds = CalculateClientAreaBounds(width(), height());
-  if (browser_view_->UsingSideTabs()) {
+  if (browser_view_->UseVerticalTabs()) {
     client_area_bounds.Inset(
         GetBoundsForTabStrip(browser_view_->tabstrip()).width() - 4, 0, 0, 0);
   }