Rejigger ThemeService: move exposure of ThemeProvider interface to a

chrome/browser/themes/theme_service_mac.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.
 
 #include "chrome/browser/themes/theme_service.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"
 #include "chrome/browser/themes/browser_theme_pack.h"
@@ skipping 94 matching lines @@
 }
 
 NSColor* ThemeService::GetNSColor(int id) const {
   DCHECK(CalledOnValidThread());
 
   // Check to see if we already have the color in the cache.
   NSColorMap::const_iterator nscolor_iter = nscolor_cache_.find(id);
   if (nscolor_iter != nscolor_cache_.end())
     return nscolor_iter->second;
 
-  SkColor sk_color = GetColor(id);
+  SkColor sk_color = GetColor(id, false);
   NSColor* color = skia::SkColorToCalibratedNSColor(sk_color);
 
   // We loaded successfully.  Cache the color.
   if (color)
     nscolor_cache_[id] = [color retain];
 
   return color;
 }
 
 NSColor* ThemeService::GetNSColorTint(int id) const {
@@ skipping 153 matching lines @@
   }
   nscolor_cache_.clear();
 
   // Free gradients.
   for (NSGradientMap::iterator i = nsgradient_cache_.begin();
        i != nsgradient_cache_.end(); i++) {
     [i->second release];
   }
   nsgradient_cache_.clear();
 }
+
+bool ThemeService::BrowserThemeProvider::UsingSystemTheme() const {
+  return theme_service_.UsingSystemTheme();
+}
+
+NSImage* ThemeService::BrowserThemeProvider::GetNSImageNamed(int id) const {
+  return theme_service_.GetNSImageNamed(id);
+}
+
+NSColor* ThemeService::BrowserThemeProvider::GetNSImageColorNamed(
+    int id) const {
+  return theme_service_.GetNSImageColorNamed(id);
+}
+
+NSColor* ThemeService::BrowserThemeProvider::GetNSColor(int id) const {
+  return theme_service_.GetNSColor(id);
+}
+
+NSColor* ThemeService::BrowserThemeProvider::GetNSColorTint(int id) const {
+  return theme_service_.GetNSColorTint(id);
+}
+
+NSGradient* ThemeService::BrowserThemeProvider::GetNSGradient(int id) const {
+  return theme_service_.GetNSGradient(id);
+}