Rejigger ThemeService: move exposure of ThemeProvider interface to a

chrome/browser/ui/cocoa/styled_text_field_cell.mm

 // Copyright (c) 2011 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/ui/cocoa/styled_text_field_cell.h"
 
 #include "base/logging.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
@@ skipping 72 matching lines @@
   rect_path_utils::RoundedCornerFlags roundedCornerFlags =
       [self roundedCornerFlags];
 
   // TODO(shess): This inset is also reflected by |kFieldVisualInset|
   // in omnibox_popup_view_mac.mm.
   const NSRect frame = NSInsetRect(cellFrame, 0, lineWidth);
   const CGFloat radius = [self cornerRadius];
 
   // Paint button background image if there is one (otherwise the border won't
   // look right).
-  ThemeService* themeProvider =
-      static_cast<ThemeService*>([[controlView window] themeProvider]);
+  ui::ThemeProvider* themeProvider = [[controlView window] themeProvider];
   if (themeProvider) {
     NSColor* backgroundImageColor = nil;
     if (themeProvider->HasCustomImage(IDR_THEME_BUTTON_BACKGROUND)) {
       backgroundImageColor =
           themeProvider->GetNSImageColorNamed(IDR_THEME_BUTTON_BACKGROUND);
     }
     if (backgroundImageColor) {
       // Set the phase to match window.
       NSRect trueRect = [controlView convertRect:cellFrame toView:nil];
       NSPoint midPoint = NSMakePoint(NSMinX(trueRect), NSMaxY(trueRect));
@@ skipping 36 matching lines @@
     NSColor* shadowShade = [NSColor colorWithCalibratedWhite:0.0
                                                        alpha:0.05 / lineWidth];
     rect_path_utils::FrameRectWithInset(roundedCornerFlags, shadowFrame,
                                         halfLineWidth, halfLineWidth,
                                         radius - halfLineWidth, lineWidth,
                                         shadowShade);
   }
 
   // Draw optional bezel below bottom stroke.
   if ([self shouldDrawBezel] && themeProvider &&
-      themeProvider->UsingDefaultTheme()) {
-
+      themeProvider->UsingSystemTheme()) {
     NSColor* bezelColor = themeProvider->GetNSColor(
         ThemeProperties::COLOR_TOOLBAR_BEZEL);
     [[bezelColor colorWithAlphaComponent:0.5 / lineWidth] set];
     NSRect bezelRect = NSMakeRect(cellFrame.origin.x,
                                   NSMaxY(cellFrame) - lineWidth,
                                   NSWidth(cellFrame),
                                   lineWidth);
     bezelRect = NSInsetRect(bezelRect, radius - halfLineWidth, 0.0);
     NSRectFillUsingOperation(bezelRect, NSCompositeSourceOver);
   }
 
   // Draw the interior before the focus ring, to make sure nothing overlaps it.
   ui::ScopedCGContextSmoothFonts fontSmoothing;
   [self drawInteriorWithFrame:cellFrame inView:controlView];
 
   // Draw the focus ring if needed.
   if ([self showsFirstResponder]) {
     NSColor* color = [[NSColor keyboardFocusIndicatorColor]
         colorWithAlphaComponent:0.5 / lineWidth];
     rect_path_utils::FrameRectWithInset(roundedCornerFlags, frame, 0.0, 0.0,
                                         radius, lineWidth * 2, color);
   }
 }
 
 @end