Integrate gfx::Image into the ResourceBundle.

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 <Foundation/Foundation.h>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
@@ skipping 40 matching lines @@
   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);
 }
 
-NSImage* ResourceBundle::GetNSImageNamed(int resource_id) {
-  // Currently this doesn't make a cache holding these as NSImages because
-  // GetBitmapNamed has a cache, and we don't want to double cache.
-  SkBitmap* bitmap = GetBitmapNamed(resource_id);
-  if (!bitmap)
-    return nil;
-
-  NSImage* nsimage = gfx::SkBitmapToNSImage(*bitmap);
-  return nsimage;
+gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) {
+  // Currently this just returns the Skia-backed image, which will convert to
+  // NSImage and cache that result when necessary.
+  // TODO(rsesek): Load the raw bytes directly into an NSImage instead.
+  return GetImageNamed(resource_id);
 }
 
 }  // namespace ui