Fix a small layout glitch in Metro after the recent Ash/Desktop merge.

chrome/browser/ui/views/tabs/tab.cc

 // Copyright (c) 2012 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/ui/views/tabs/tab.h"
 
 #include <limits>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
@@ skipping 87 matching lines @@
         value = 7;
         break;
       default:
         NOTREACHED();
     }
   }
   return value;
 }
 
 // Height of the shadow at the top of the tab image assets.
-static const int kDropShadowHeight = 4;
+const int GetDropShadowHeight() {
+  static int value = -1;
+  if (value == -1) {
+    switch (ui::GetDisplayLayout()) {
+      case ui::LAYOUT_ASH:
+      case ui::LAYOUT_DESKTOP:
+        value = 4;
+        break;
+      case ui::LAYOUT_TOUCH:
+        value = 2;
+        break;
+      default:
+        NOTREACHED();
+    }
+  }
+  return value;
+}
+
 static const int kToolbarOverlap = 1;
 static const int kFaviconTitleSpacing = 4;
 #if defined(USE_ASH)
 // Additional vertical offset for title text relative to top of tab.
 // Ash text rendering may be different than Windows.
 // TODO(jamescook): Make this Chrome OS or Linux only?
 static const int kTitleTextOffsetY = 1;
 #else
 static const int kTitleTextOffsetY = 0;
 #endif
@@ skipping 428 matching lines @@
       offset + width() - tab_image->r_width, bg_offset_y,
       tab_image->r_width, height());
   SkBitmap theme_r =
       SkBitmapOperations::CreateMaskedBitmap(tab_r, *alpha->image_r);
   background_canvas.DrawBitmapInt(theme_r,
       0, 0, theme_r.width(), theme_r.height() - kToolbarOverlap,
       width() - theme_r.width(), 0, theme_r.width(),
       theme_r.height() - kToolbarOverlap, false);
 
   // Draw center.  Instead of masking out the top portion we simply skip over
-  // it by incrementing by kDropShadowHeight, since it's a simple rectangle.
-  // And again, don't draw over the toolbar.
+  // it by incrementing by GetDropShadowHeight(), since it's a simple
+  // rectangle. And again, don't draw over the toolbar.
   background_canvas.TileImageInt(*tab_bg,
      offset + tab_image->l_width,
-     bg_offset_y + kDropShadowHeight + tab_image->y_offset,
+     bg_offset_y + GetDropShadowHeight() + tab_image->y_offset,
      tab_image->l_width,
-     kDropShadowHeight + tab_image->y_offset,
+     GetDropShadowHeight() + tab_image->y_offset,
      width() - tab_image->l_width - tab_image->r_width,
-     height() - kDropShadowHeight - kToolbarOverlap - tab_image->y_offset);
+     height() - GetDropShadowHeight() - kToolbarOverlap - tab_image->y_offset);
 
   canvas->DrawBitmapInt(background_canvas.ExtractBitmap(), 0, 0);
 
   if (!GetThemeProvider()->HasCustomImage(tab_id) &&
       hover_controller().ShouldDraw()) {
     hover_controller().Draw(canvas, background_canvas.ExtractBitmap());
   }
 
   // Now draw the highlights/shadows around the tab edge.
   canvas->DrawBitmapInt(*tab_inactive_image->image_l, 0, 0);
@@ skipping 24 matching lines @@
   canvas->DrawBitmapInt(theme_l, 0, 0);
 
   // Draw right edge.
   SkBitmap tab_r = SkBitmapOperations::CreateTiledBitmap(*tab_bg,
       offset + width() - tab_image->r_width, 0, tab_image->r_width, height());
   SkBitmap theme_r =
       SkBitmapOperations::CreateMaskedBitmap(tab_r, *alpha->image_r);
   canvas->DrawBitmapInt(theme_r, width() - tab_image->r_width, 0);
 
   // Draw center.  Instead of masking out the top portion we simply skip over it
-  // by incrementing by kDropShadowHeight, since it's a simple rectangle.
+  // by incrementing by GetDropShadowHeight(), since it's a simple rectangle.
   canvas->TileImageInt(*tab_bg,
      offset + tab_image->l_width,
-     kDropShadowHeight + tab_image->y_offset,
+     GetDropShadowHeight() + tab_image->y_offset,
      tab_image->l_width,
-     kDropShadowHeight + tab_image->y_offset,
+     GetDropShadowHeight() + tab_image->y_offset,
      width() - tab_image->l_width - tab_image->r_width,
-     height() - kDropShadowHeight - tab_image->y_offset);
+     height() - GetDropShadowHeight() - tab_image->y_offset);
 
   // Now draw the highlights/shadows around the tab edge.
   canvas->DrawBitmapInt(*tab_image->image_l, 0, 0);
   canvas->TileImageInt(*tab_image->image_c, tab_image->l_width, 0,
       width() - tab_image->l_width - tab_image->r_width, height());
   canvas->DrawBitmapInt(*tab_image->image_r, width() - tab_image->r_width, 0);
 }
 
 int Tab::IconCapacity() const {
   if (height() < GetMinimumUnselectedSize().height())
@@ skipping 63 matching lines @@
   tab_active_.image_r = rb.GetBitmapNamed(IDR_TAB_ACTIVE_RIGHT);
   tab_active_.l_width = tab_active_.image_l->width();
   tab_active_.r_width = tab_active_.image_r->width();
 
   tab_inactive_.image_l = rb.GetBitmapNamed(IDR_TAB_INACTIVE_LEFT);
   tab_inactive_.image_c = rb.GetBitmapNamed(IDR_TAB_INACTIVE_CENTER);
   tab_inactive_.image_r = rb.GetBitmapNamed(IDR_TAB_INACTIVE_RIGHT);
   tab_inactive_.l_width = tab_inactive_.image_l->width();
   tab_inactive_.r_width = tab_inactive_.image_r->width();
 }