ShortcutInfo::favicon is now a gfx::ImageFamily instead of gfx::Image.

chrome/browser/ui/gtk/create_application_shortcuts_dialog_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 "chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/environment.h"
@@ skipping 15 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/gtk_util.h"
+#include "ui/gfx/icon_family.h"
 #include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/image/image_skia_rep.h"
 
 using content::BrowserThread;
 using extensions::Extension;
 
 namespace {
 
 // Size (in pixels) of the icon preview.
 const int kIconPreviewSizePixels = 32;
 
 // Minimum width (in pixels) of the shortcut description label.
@@ skipping 28 matching lines @@
     favicon_pixbuf_(NULL),
     create_dialog_(NULL),
     error_dialog_(NULL) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Will be balanced by Release later.
   AddRef();
 }
 
 void CreateApplicationShortcutsDialogGtk::CreateIconPixBuf(
-    const gfx::Image& image) {
-  const gfx::ImageSkia& image_skia = *(image.ToImageSkia());
-  std::vector<gfx::ImageSkiaRep> image_reps = image_skia.image_reps();
-  // Find the smallest icon bigger or equal to the desired size. If it cannot be
-  // found, find the biggest icon smaller than the desired size.
-  const gfx::ImageSkiaRep* smallest_larger = NULL;
-  const gfx::ImageSkiaRep* largest_smaller = NULL;
-  for (std::vector<gfx::ImageSkiaRep>::const_iterator it = image_reps.begin();
-       it != image_reps.end(); ++it) {
-    if (it->pixel_width() >= kIconPreviewSizePixels) {
-      if (!smallest_larger ||
-          it->pixel_width() < smallest_larger->pixel_width()) {
-        smallest_larger = &*it;
-      }
-    } else {
-      if (!largest_smaller ||
-          it->pixel_width() > largest_smaller->pixel_width()) {
-        largest_smaller = &*it;
-      }
-    }
-  }
-  GdkPixbuf* pixbuf;
-  if (smallest_larger) {
-    pixbuf = gfx::GdkPixbufFromSkBitmap(smallest_larger->sk_bitmap());
-  } else if (largest_smaller) {
-    pixbuf = gfx::GdkPixbufFromSkBitmap(largest_smaller->sk_bitmap());
-  } else {
-    // Should never happen unless the image has no representations. Call
-    // ToGdkPixbuf which will presumably return a null image representation.
-    pixbuf = static_cast<GdkPixbuf*>(g_object_ref(image.ToGdkPixbuf()));
-  }
+    const gfx::IconFamily& image) {
+  // Get the icon closest to the desired preview size.
+  const gfx::ImageSkia* icon = image.Get(kIconPreviewSizePixels);
+  if (!icon)
+    // The family has no icons. Leave the pixbuf as NULL.
+    return;
+
+  GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(*icon->bitmap());
   // Prepare the icon. Scale it to the correct size to display in the dialog.
   int pixbuf_width = gdk_pixbuf_get_width(pixbuf);
   int pixbuf_height = gdk_pixbuf_get_height(pixbuf);
   if (pixbuf_width == pixbuf_height) {
     // Only scale the pixbuf if it's a square (for simplicity).
     // Generally it should be square, if it's a favicon or app icon.
     // Use the highest quality interpolation.
     favicon_pixbuf_ = gdk_pixbuf_scale_simple(pixbuf,
                                               kIconPreviewSizePixels,
                                               kIconPreviewSizePixels,
@@ skipping 250 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   if (web_app::CreateShortcutsOnFileThread(shortcut_info, creation_locations)) {
     Release();
   } else {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         base::Bind(&CreateChromeApplicationShortcutsDialogGtk::ShowErrorDialog,
                    this));
   }
 }