Add support for multi resolution icons

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"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMNSColor+Luminance.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_utils.h"
+#include "ui/gfx/image.h"
 
 NSString* const kBrowserThemeDidChangeNotification =
     @"BrowserThemeDidChangeNotification";
 
 namespace {
 
 void HSLToHSB(const color_utils::HSL& hsl, CGFloat* h, CGFloat* s, CGFloat* b) {
   SkColor color = color_utils::HSLToSkColor(hsl, 255);  // alpha doesn't matter
   SkScalar hsv[3];
   SkColorToHSV(color, hsv);
@@ skipping 13 matching lines @@
 
   // Check to see if we already have the image in the cache.
   NSImageMap::const_iterator nsimage_iter = nsimage_cache_.find(id);
   if (nsimage_iter != nsimage_cache_.end())
     return nsimage_iter->second;
 
   // Why don't we load the file directly into the image instead of the whole
   // SkBitmap > native conversion?
   // - For consistency with other platforms.
   // - To get the generated tinted images.
-  SkBitmap* bitmap = GetBitmapNamed(id);
-  NSImage* nsimage = gfx::SkBitmapToNSImage(*bitmap);
+  NSImage* nsimage = nil;
+  if (theme_pack_.get()) {
+    SkBitmap* bitmap = theme_pack_->GetBitmapNamed(id);
+    if (bitmap)
+      nsimage = gfx::SkBitmapToNSImage(*bitmap);
+  }
+
+  if (!nsimage) {
+    nsimage = static_cast<NSImage*>(rb_.GetNativeImageNamed(id));

[Robert Sesek, 2011/04/15 20:27:20]

You can probably get away without the static cast by just de-referencing the
gfx::Image.

[sail, 2011/04/16 01:25:00]

Done.

[sail, 2011/04/16 01:25:00]

Done.

+  }
 
   // We loaded successfully.  Cache the image.
   if (nsimage) {
     nsimage_cache_[id] = [nsimage retain];
     return nsimage;
   }
 
   // We failed to retrieve the bitmap, show a debugging red square.
   LOG(WARNING) << "Unable to load NSImage with id " << id;
   NOTREACHED();  // Want to assert in debug mode.
@@ skipping 245 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();
 }