Merge 23023 - Allow theming of colors for the Mac....

chrome/browser/browser_theme_provider_mac.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.
 
 #include "chrome/browser/browser_theme_provider.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"
 #include "skia/ext/skia_utils_mac.h"
@@ skipping 34 matching lines @@
     empty_image = [[NSImage alloc] initWithSize:image_rect.size];
     [empty_image lockFocus];
     [[NSColor redColor] set];
     NSRectFill(image_rect);
     [empty_image unlockFocus];
   }
 
   return empty_image;
 }
 
+NSColor* BrowserThemeProvider::GetNSColor(int id) {
+  DCHECK(CalledOnValidThread());
+
+  // Check to see if we already have the color in the cache.
+  NSColorMap::const_iterator found = nscolor_cache_.find(id);
+  if (found != nscolor_cache_.end())
+    return found->second;
+
+  ColorMap::iterator color_iter = colors_.find(GetColorKey(id));
+  if (color_iter != colors_.end()) {
+    const SkColor& sk_color = color_iter->second;
+
+    NSColor* color = [NSColor colorWithCalibratedRed:SkColorGetR(sk_color)
+                                               green:SkColorGetG(sk_color)
+                                                blue:SkColorGetB(sk_color)
+                                               alpha:SkColorGetA(sk_color)];
+
+    // We loaded successfully.  Cache the color.
+    if (color) {
+      nscolor_cache_[id] = [color retain];
+      return color;
+    }
+  }
+
+  return nil;
+}
+
 NSColor* BrowserThemeProvider::GetNSColorTint(int id) {
   DCHECK(CalledOnValidThread());
 
   // Check to see if we already have the color in the cache.
   NSColorMap::const_iterator found = nscolor_cache_.find(id);
   if (found != nscolor_cache_.end())
     return found->second;
 
   TintMap::iterator tint_iter = tints_.find(GetTintKey(id));
   if (tint_iter != tints_.end()) {
@@ skipping 27 matching lines @@
   }
   nsimage_cache_.clear();
 
   // Free colors.
   for (NSColorMap::iterator i = nscolor_cache_.begin();
        i != nscolor_cache_.end(); i++) {
     [i->second release];
   }
   nscolor_cache_.clear();
 }