[Mac] Fix aesthetic issues with themes given the new TopChrome changes....

chrome/browser/cocoa/styled_text_field_cell.mm

 // Copyright (c) 2009 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/styled_text_field_cell.h"
 
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_theme_provider.h"
 #import "chrome/browser/cocoa/themed_window.h"
@@ skipping 111 matching lines @@
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   DCHECK([controlView isFlipped]);
 
   // TODO(shess): This inset is also reflected by |kFieldVisualInset|
   // in autocomplete_popup_view_mac.mm.
   const NSRect frame = NSInsetRect(cellFrame, 0, 1);
   const CGFloat radius = [self cornerRadius];
 
   // Paint button background image if there is one (otherwise the border won't
   // look right).
-  ThemeProvider* themeProvider = [[controlView window] themeProvider];
+  BrowserThemeProvider* themeProvider =
+      static_cast<BrowserThemeProvider*>([[controlView window] themeProvider]);
   if (themeProvider) {
     NSColor* backgroundImageColor =
         themeProvider->GetNSImageColorNamed(IDR_THEME_BUTTON_BACKGROUND, false);
     if (backgroundImageColor) {
       // Set the phase to match window.
       NSRect trueRect = [controlView convertRect:cellFrame toView:nil];
       NSPoint midPoint = NSMakePoint(NSMinX(trueRect), NSMaxY(trueRect));
       [[NSGraphicsContext currentContext] setPatternPhase:midPoint];
 
       // NOTE(shess): This seems like it should be using a 0.0 inset,
@@ skipping 21 matching lines @@
   // will clip the bottom and right edges (and corner).
   {
     ScopedSaveGraphicsState state;
     [RectPathWithInset(frame, 1.0, radius) addClip];
     const NSRect shadowFrame = NSOffsetRect(frame, 0.5, 0.5);
     NSColor* shadowShade = [NSColor colorWithCalibratedWhite:0.0 alpha:0.05];
     FrameRectWithInset(shadowFrame, 0.5, radius - 0.5, 1.0, shadowShade);
   }
 
   // Draw optional bezel below bottom stroke.
-  if ([self shouldDrawBezel]) {
-    [[NSColor colorWithCalibratedWhite:0.96 alpha:1.0] set];
+  if ([self shouldDrawBezel] && themeProvider &&
+      themeProvider->UsingDefaultTheme()) {
+
+    [themeProvider->GetNSColor(
+        BrowserThemeProvider::COLOR_TOOLBAR_BEZEL, true) set];
     NSRect bezelRect = NSMakeRect(cellFrame.origin.x,
                                   NSMaxY(cellFrame) - 0.5,
                                   NSWidth(cellFrame),
                                   1.0);
     bezelRect = NSInsetRect(bezelRect, radius - 0.5, 0.0);
     NSRectFill(bezelRect);
   }
 
   // Draw the focus ring if needed.
   if ([self showsFirstResponder]) {
     NSColor* color =
         [[NSColor keyboardFocusIndicatorColor] colorWithAlphaComponent:0.5];
     FrameRectWithInset(frame, 0.0, radius, 2.0, color);
   }
 
   [self drawInteriorWithFrame:cellFrame inView:controlView];
 }
 
 @end