Expose array of bitmaps contained by gfx::Image similar to NSImage

chrome/browser/web_applications/web_app_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.
 
 #import "chrome/browser/web_applications/web_app_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/file_util.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/scoped_temp_dir.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/mac/app_mode_common.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/chromium_strings.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/icon_family/IconFamily.h"
 #include "ui/base/l10n/l10n_util_mac.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace {
 
 // Creates a NSBitmapImageRep from |bitmap|.
 NSBitmapImageRep* SkBitmapToImageRep(const SkBitmap& bitmap) {
   base::mac::ScopedCFTypeRef<CGColorSpaceRef> color_space(
       CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB));
   NSImage* image = gfx::SkBitmapToNSImageWithColorSpace(
     bitmap, color_space.get());
   return base::mac::ObjCCast<NSBitmapImageRep>(
@@ skipping 155 matching lines @@
             forKey:app_mode::kCrAppModeExtensionPathKey];
   return [plist writeToFile:plist_path atomically:YES];
 }
 
 bool WebAppShortcutCreator::UpdateIcon(const FilePath& app_path) const {
   if (info_.favicon.IsEmpty())
     return true;
 
   scoped_nsobject<IconFamily> icon_family([[IconFamily alloc] init]);
   bool image_added = false;
-  for (size_t i = 0; i < info_.favicon.GetNumberOfSkBitmaps(); ++i) {
-    NSBitmapImageRep* image_rep =
-        SkBitmapToImageRep(*info_.favicon.GetSkBitmapAtIndex(i));
+  const std::vector<const SkBitmap*>& bitmaps =
+      info_.favicon.ToImageSkia()->bitmaps();
+  for (size_t i = 0; i < bitmaps.size(); ++i) {
+    NSBitmapImageRep* image_rep = SkBitmapToImageRep(*bitmaps[i]);
     if (!image_rep)
       continue;
 
     // Missing an icon size is not fatal so don't fail if adding the bitmap
     // doesn't work.
     if (!AddBitmapImageRepToIconFamily(icon_family, image_rep))
       continue;
 
     image_added = true;
   }
@@ skipping 41 matching lines @@
     const ShellIntegration::ShortcutInfo& shortcut_info) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
   string16 bundle_id = UTF8ToUTF16(base::mac::BaseBundleID());
   WebAppShortcutCreator shortcut_creator(web_app_path, shortcut_info,
                             bundle_id);
   return shortcut_creator.CreateShortcut();
 }
 
 }  // namespace internals
 }  // namespace web_app