Merge 55906 - [Mac] Fix aesthetic issues with themes given the new TopChrome ...

chrome/browser/cocoa/tab_strip_view.mm

 // 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.
 
 #import "chrome/browser/cocoa/tab_strip_view.h"
 
 #include "base/mac_util.h"
+#include "chrome/browser/browser_theme_provider.h"
 #import "chrome/browser/cocoa/browser_window_controller.h"
 #import "chrome/browser/cocoa/tab_strip_controller.h"
 #include "base/logging.h"
 
 @implementation TabStripView
 
 @synthesize newTabButton = newTabButton_;
 @synthesize dropArrowShown = dropArrowShown_;
 @synthesize dropArrowPosition = dropArrowPosition_;
 
@@ skipping 15 matching lines @@
 // tab.
 - (void)drawBorder:(NSRect)bounds {
   NSRect borderRect, contentRect;
 
   borderRect = bounds;
   borderRect.origin.y = 1;
   borderRect.size.height = 1;
   [[NSColor colorWithCalibratedWhite:0.0 alpha:0.2] set];
   NSRectFillUsingOperation(borderRect, NSCompositeSourceOver);
   NSDivideRect(bounds, &borderRect, &contentRect, 1, NSMinYEdge);
-  [[NSColor colorWithCalibratedWhite:0.96 alpha:1.0] set];
+
+  BrowserThemeProvider* themeProvider =
+      static_cast<BrowserThemeProvider*>([[self window] themeProvider]);
+  if (!themeProvider)
+    return;
+
+  NSColor* bezelColor = themeProvider->GetNSColor(
+      themeProvider->UsingDefaultTheme() ?
+          BrowserThemeProvider::COLOR_TOOLBAR_BEZEL :
+          BrowserThemeProvider::COLOR_TOOLBAR, true);
+  [bezelColor set];
+  NSRectFill(borderRect);
   NSRectFillUsingOperation(borderRect, NSCompositeSourceOver);
 }
 
 - (void)drawRect:(NSRect)rect {
   NSRect boundsRect = [self bounds];
 
   [self drawBorder:boundsRect];
 
   // Draw drop-indicator arrow (if appropriate).
   // TODO(viettrungluu): this is all a stop-gap measure.
@@ skipping 131 matching lines @@
 }
 
 - (id)accessibilityAttributeValue:(NSString*)attribute {
   if ([attribute isEqual:NSAccessibilityRoleAttribute])
     return NSAccessibilityGroupRole;
 
   return [super accessibilityAttributeValue:attribute];
 }
 
 @end