Add support for multi resolution icons

ui/base/resource/resource_bundle_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 "ui/base/resource/resource_bundle.h"
 
 #import <AppKit/AppKit.h>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
@@ skipping 44 matching lines @@
 
   // On disk, the "en_US" resources are just "en" (http://crbug.com/25578).
   if ([mac_locale isEqual:@"en_US"])
     mac_locale = @"en";
 
   return GetResourcesPakFilePath(@"locale", mac_locale);
 }
 
 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) {
   // Check to see if the image is already in the cache.
-  {
-    base::AutoLock lock(*lock_);
-    ImageMap::const_iterator found = images_.find(resource_id);
-    if (found != images_.end()) {
-      if (!found->second->HasRepresentation(gfx::Image::kNSImageRep)) {
-        DLOG(WARNING) << "ResourceBundle::GetNativeImageNamed() is returning a"
-          << " cached gfx::Image that isn't backed by an NSImage. The image"
-          << " will be converted, rather than going through the NSImage loader."
-          << " resource_id = " << resource_id;
-      }
-      return *found->second;
-    }
-  }
+  std::vector<gfx::Image*> images;
+  if (GetImagesFromCacheNamed(resource_id, images) && !images.empty())
+    return **images.begin();
 
   // Load the raw data from the resource pack.
   scoped_refptr<RefCountedStaticMemory> data(
       LoadDataResourceBytes(resource_id));
 
   // Create a data object from the raw bytes.
   scoped_nsobject<NSData> ns_data([[NSData alloc] initWithBytes:data->front()
                                                          length:data->size()]);
 
   // Create the image from the data. The gfx::Image will take ownership of this.
   scoped_nsobject<NSImage> ns_image([[NSImage alloc] initWithData:ns_data]);
 
   // Cache the converted image.
   if (ns_image.get()) {
-    base::AutoLock lock(*lock_);
+    {
+      base::AutoLock lock(*lock_);
 
-    // Another thread raced the load and has already cached the image.
-    if (images_.count(resource_id)) {
-      return *images_[resource_id];
+      // Has another thread raced the load and has already cached the image?
+      if (!images_.count(resource_id)) {
+        gfx::Image* image = new gfx::Image(ns_image.release());
+        std::vector<gfx::Image*>* images_ptr = new std::vector<gfx::Image*>;
+        images_ptr->push_back(image);
+        images_[resource_id] = images_ptr;
+        return *image;
+      }
     }
 
-    gfx::Image* image = new gfx::Image(ns_image.release());
-    images_[resource_id] = image;
-    return *image;
+    if (GetImagesFromCacheNamed(resource_id, images) && !images.empty())
+      return **images.begin();
   }
 
   LOG(WARNING) << "Unable to load image with id " << resource_id;
   NOTREACHED();  // Want to assert in debug mode.
   return *GetEmptyImage();
 }
 
 }  // namespace ui