Add new ResourceBundle::Delegate interface.

ui/base/resource/resource_bundle_gtk.cc

 // 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"
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/path_service.h"
@@ skipping 38 matching lines @@
     // exists.
     g_object_ref(pixbuf);
     return pixbuf;
   }
 }
 
 FilePath GetResourcesPakFilePath(const std::string& pak_name) {
   FilePath path;
   if (PathService::Get(base::DIR_MODULE, &path))
     return path.AppendASCII(pak_name.c_str());
-  return FilePath();
+
+  // Return just the name of the pack file.
+  return FilePath(pak_name.c_str());
 }
 
 }  // namespace
 
 void ResourceBundle::LoadCommonResources() {
   AddDataPack(GetResourcesPakFilePath("chrome.pak"),
               ResourceHandle::kScaleFactor100x);
   AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),
               ResourceHandle::kScaleFactor100x);
   AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
               ResourceHandle::kScaleFactor100x);
 }
 
 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {

[Robert Sesek, 2012/05/03 19:53:57]

const?

[Marshall, 2012/05/04 14:41:03]

Done.

   // Use the negative |resource_id| for the key for BIDI-aware images.
   int key = rtl == RTL_ENABLED ? -resource_id : resource_id;
 
   // Check to see if the image is already in the cache.
   {
     base::AutoLock lock_scope(*images_and_fonts_lock_);
     ImageMap::const_iterator found = images_.find(key);
     if (found != images_.end())
       return *found->second;
   }
 
-  scoped_refptr<base::RefCountedStaticMemory> data(
-      LoadDataResourceBytes(resource_id));
-  GdkPixbuf* pixbuf = LoadPixbuf(data.get(), rtl == RTL_ENABLED);
+  gfx::Image image;
+  if (delegate_)
+    image = delegate_->GetNativeImageNamed(resource_id, rtl);
 
-  // The load was successful, so cache the image.
-  if (pixbuf) {
-    base::AutoLock lock_scope(*images_and_fonts_lock_);
+  if (image.IsEmpty()) {
+    scoped_refptr<base::RefCountedStaticMemory> data(
+        LoadDataResourceBytes(resource_id));
+    GdkPixbuf* pixbuf = LoadPixbuf(data.get(), rtl == RTL_ENABLED);
 
-    // Another thread raced the load and has already cached the image.
-    if (images_.count(key)) {
-      g_object_unref(pixbuf);
-      return *images_[key];
+    if (!pixbuf) {
+      LOG(WARNING) << "Unable to load pixbuf with id " << resource_id;
+      NOTREACHED();  // Want to assert in debug mode.
+      return *GetEmptyImage();
     }
 
-    gfx::Image* image = new gfx::Image(pixbuf);  // Takes ownership.
-    images_[key] = image;
-    return *image;
+    image = gfx::Image(pixbuf);  // Takes ownership.
   }
 
-  LOG(WARNING) << "Unable to pixbuf with id " << resource_id;
-  NOTREACHED();  // Want to assert in debug mode.
-  return *GetEmptyImage();
+  base::AutoLock lock_scope(*images_and_fonts_lock_);
+
+  // Another thread raced the load and has already cached the image.
+  if (images_.count(key))
+    return images_[key];
+
+  images_[key] = image;
+  return images_[key];
 }
 
 }  // namespace ui