Add new ResourceBundle::Delegate interface.

ui/base/resource/resource_bundle_mac.mm

 // Copyright (c) 2012 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 26 matching lines @@
                                                            ofType:@"pak"];
   }
   if (!resource_path)
     return FilePath();
   return FilePath([resource_path fileSystemRepresentation]);
 }
 
 }  // namespace
 
 void ResourceBundle::LoadCommonResources() {
-  AddDataPack(GetResourcesPakFilePath(@"chrome", nil));
-  AddDataPack(GetResourcesPakFilePath(@"theme_resources_standard", nil));
-  AddDataPack(GetResourcesPakFilePath(@"ui_resources_standard", nil));
+  AddCommonDataPack("chrome", GetResourcesPakFilePath(@"chrome", nil));
+  AddCommonDataPack("theme_resources_standard",
+      GetResourcesPakFilePath(@"theme_resources_standard", nil));
+  AddCommonDataPack("ui_resources_standard",
+      GetResourcesPakFilePath(@"ui_resources_standard", nil));
 
   // On Windows and ChromeOS we load either the 1x resource or the 2x resource.
   // On Mac we load both and let the UI framework decide which one to use.
 #if defined(ENABLE_HIDPI)
   if (base::mac::IsOSLionOrLater()) {
-    AddDataPack(GetResourcesPakFilePath(@"theme_resources_2x", nil));
-    AddDataPack(GetResourcesPakFilePath(@"theme_resources_standard_2x", nil));
-    AddDataPack(GetResourcesPakFilePath(@"ui_resources_standard_2x", nil));
+    AddCommonDataPack("theme_resources_2x",
+        GetResourcesPakFilePath(@"theme_resources_2x", nil));
+    AddCommonDataPack("theme_resources_standard_2x",
+        GetResourcesPakFilePath(@"theme_resources_standard_2x", nil));
+    AddCommonDataPack("ui_resources_standard_2x",
+        GetResourcesPakFilePath(@"ui_resources_standard_2x", nil));
   }
 #endif
 }
 
 // static
 FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale) {
   NSString* mac_locale = base::SysUTF8ToNSString(app_locale);
 
   // Mac OS X uses "_" instead of "-", so swap to get a Mac-style value.
   mac_locale = [mac_locale stringByReplacingOccurrencesOfString:@"-"
                                                      withString:@"_"];
 
   // 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);
+  FilePath locale_file_path = GetResourcesPakFilePath(@"locale", mac_locale);
+
+  if (delegate_ &&
+      !delegate_->GetPathForLocalePack(app_locale, &locale_file_path)) {
+    return FilePath();
+  }
+
+  return locale_file_path;
 }
 
 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
   // Flipped images are not used on Mac.
   DCHECK_EQ(rtl, RTL_DISABLED);
 
   // Check to see if the image is already in the cache.
   {
     base::AutoLock lock(*images_and_fonts_lock_);
     ImageMap::const_iterator found = images_.find(resource_id);
     if (found != images_.end()) {
       if (!found->second->HasRepresentation(gfx::Image::kImageRepCocoa)) {
         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;
     }
   }
 
-  scoped_nsobject<NSImage> ns_image;
-  for (size_t i = 0; i < data_packs_.size(); ++i) {
-    scoped_refptr<base::RefCountedStaticMemory> data(
-        data_packs_[i]->GetStaticMemory(resource_id));
-    if (!data.get())
-      continue;
+  gfx::Image* image = NULL;
+  if (delegate_)
+    image = delegate_->GetNativeImageNamed(resource_id, rtl);
 
-    scoped_nsobject<NSData> ns_data(
-        [[NSData alloc] initWithBytes:data->front()
-                               length:data->size()]);
+  if (!image) {
+    scoped_nsobject<NSImage> ns_image;
+    for (size_t i = 0; i < data_packs_.size(); ++i) {
+      scoped_refptr<base::RefCountedStaticMemory> data(
+          data_packs_[i]->GetStaticMemory(resource_id));
+      if (!data.get())
+        continue;
+
+      scoped_nsobject<NSData> ns_data(
+          [[NSData alloc] initWithBytes:data->front()
+                                 length:data->size()]);
+      if (!ns_image.get()) {
+        ns_image.reset([[NSImage alloc] initWithData:ns_data]);
+      } else {
+        NSImageRep* image_rep = [NSBitmapImageRep imageRepWithData:ns_data];
+        if (image_rep)
+          [ns_image addRepresentation:image_rep];
+      }
+    }
+
     if (!ns_image.get()) {
-      ns_image.reset([[NSImage alloc] initWithData:ns_data]);
-    } else {
-      NSImageRep* image_rep = [NSBitmapImageRep imageRepWithData:ns_data];
-      if (image_rep)
-        [ns_image addRepresentation:image_rep];
+      LOG(WARNING) << "Unable to load image with id " << resource_id;
+      NOTREACHED();  // Want to assert in debug mode.
+      return *GetEmptyImage();
     }
-  }
 
-  if (!ns_image.get()) {
-    LOG(WARNING) << "Unable to load image with id " << resource_id;
-    NOTREACHED();  // Want to assert in debug mode.
-    return *GetEmptyImage();
+    image = new gfx::Image(ns_image.release());
   }
 
   base::AutoLock lock(*images_and_fonts_lock_);
 
   // Another thread raced the load and has already cached the image.
   if (images_.count(resource_id)) {
+    delete image;

[sail, 2012/04/30 21:14:43]

same, should avoid this if possible

[Marshall, 2012/04/30 21:50:10]

Done.

     return *images_[resource_id];
   }
 
-  gfx::Image* image = new gfx::Image(ns_image.release());
   images_[resource_id] = image;
   return *image;
 }
 
 }  // namespace ui