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

chrome/browser/cocoa/tab_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_view.h"
 
 #include "base/logging.h"
 #import "base/mac_util.h"
 #include "base/nsimage_cache_mac.h"
 #include "base/scoped_cftyperef.h"
@@ skipping 608 matching lines @@
 
 - (void)drawRect:(NSRect)dirtyRect {
   // If this tab is phantom, do not draw the tab background itself. The only UI
   // element that will represent this tab is the favicon.
   if ([controller_ phantom])
     return;
 
   NSGraphicsContext* context = [NSGraphicsContext currentContext];
   [context saveGraphicsState];
 
-  ThemeProvider* themeProvider = [[self window] themeProvider];
+  BrowserThemeProvider* themeProvider =
+      static_cast<BrowserThemeProvider*>([[self window] themeProvider]);
   [context setPatternPhase:[[self window] themePatternPhase]];
 
   NSRect rect = [self bounds];
   NSBezierPath* path = [self bezierPathForRect:rect];
 
   BOOL selected = [self state];
   // Don't draw the window/tab bar background when selected, since the tab
   // background overlay drawn over it (see below) will be fully opaque.
   BOOL hasBackgroundImage = NO;
   if (!selected) {
@@ skipping 68 matching lines @@
       }
     }
 
     CGContextEndTransparencyLayer(cgContext);
     [context restoreGraphicsState];
   }
 
   BOOL active = [[self window] isKeyWindow] || [[self window] isMainWindow];
   CGFloat borderAlpha = selected ? (active ? 0.3 : 0.2) : 0.2;
   NSColor* borderColor = [NSColor colorWithDeviceWhite:0.0 alpha:borderAlpha];
-  NSColor* highlightColor = [NSColor colorWithCalibratedWhite:0.96 alpha:1.0];
+  NSColor* highlightColor = themeProvider ? themeProvider->GetNSColor(
+      themeProvider->UsingDefaultTheme() ?
+          BrowserThemeProvider::COLOR_TOOLBAR_BEZEL :
+          BrowserThemeProvider::COLOR_TOOLBAR, true) : nil;
 
-  // Draw the top inner highlight within the currently selected tab.
-  if (selected) {
+  // Draw the top inner highlight within the currently selected tab if using
+  // the default theme.
+  if (selected && themeProvider && themeProvider->UsingDefaultTheme()) {
     NSAffineTransform* highlightTransform = [NSAffineTransform transform];
     [highlightTransform translateXBy:1.0 yBy:-1.0];
     scoped_nsobject<NSBezierPath> highlightPath([path copy]);
     [highlightPath transformUsingAffineTransform:highlightTransform];
     [highlightColor setStroke];
     [highlightPath setLineWidth:1.0];
     [highlightPath stroke];
     highlightTransform = [NSAffineTransform transform];
     [highlightTransform translateXBy:-2.0 yBy:0.0];
     [highlightPath transformUsingAffineTransform:highlightTransform];
@@ skipping 300 matching lines @@
        controlPoint1:NSMakePoint(topRight.x + bottomControlPointInset,
                                  topRight.y)
        controlPoint2:NSMakePoint(bottomRight.x - baseControlPointOutset,
                                  bottomRight.y)];
   [path lineToPoint:NSMakePoint(bottomRight.x + 1, bottomRight.y)];
   [path lineToPoint:NSMakePoint(bottomRight.x + 1, bottomRight.y - 2)];
   return path;
 }
 
 @end  // @implementation TabView(Private)