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

chrome/browser/ui/views/create_application_shortcut_view.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/views/create_application_shortcut_view.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 24 matching lines @@
 #include "net/url_request/url_request.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/icon_family.h"
 #include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/image/image_skia_rep.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 
 namespace {
 
 const int kIconPreviewSizePixels = 32;
 
 // AppInfoView shows the application icon and title.
 class AppInfoView : public views::View {
  public:
   AppInfoView(const string16& title,
               const string16& description,
-              const SkBitmap& icon);
+              const gfx::IconFamily& icon);
 
   // Updates the title/description of the web app.
   void UpdateText(const string16& title, const string16& description);
 
   // Updates the icon of the web app.
-  void UpdateIcon(const gfx::Image& image);
+  void UpdateIcon(const gfx::IconFamily& image);
 
   // Overridden from views::View:
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
  private:
   // Initializes the controls
   void Init(const string16& title,
-            const string16& description, const SkBitmap& icon);
+            const string16& description, const gfx::IconFamily& icon);
 
   // Creates or updates description label.
   void PrepareDescriptionLabel(const string16& description);
 
   // Sets up layout manager.
   void SetupLayout();
 
   views::ImageView* icon_;
   views::Label* title_;
   views::Label* description_;
 };
 
 AppInfoView::AppInfoView(const string16& title,
                          const string16& description,
-                         const SkBitmap& icon)
+                         const gfx::IconFamily& icon)
     : icon_(NULL),
       title_(NULL),
       description_(NULL) {
   Init(title, description, icon);
 }
 
 void AppInfoView::Init(const string16& title_text,
                        const string16& description_text,
-                       const SkBitmap& icon) {
+                       const gfx::IconFamily& icon) {
   icon_ = new views::ImageView();
-  icon_->SetImage(gfx::ImageSkia::CreateFrom1xBitmap(icon));
+  UpdateIcon(icon);
   icon_->SetImageSize(gfx::Size(kIconPreviewSizePixels,
                                 kIconPreviewSizePixels));
 
   title_ = new views::Label(title_text);
   title_->SetMultiLine(true);
   title_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   title_->SetFont(ui::ResourceBundle::GetSharedInstance().GetFont(
       ui::ResourceBundle::BaseFont).DeriveFont(0, gfx::Font::BOLD));
 
   PrepareDescriptionLabel(description_text);
@@ skipping 48 matching lines @@
 }
 
 void AppInfoView::UpdateText(const string16& title,
                              const string16& description) {
   title_->SetText(title);
   PrepareDescriptionLabel(description);
 
   SetupLayout();
 }
 
-void AppInfoView::UpdateIcon(const gfx::Image& image) {
-  if (image.IsEmpty())
+void AppInfoView::UpdateIcon(const gfx::IconFamily& image) {
+  // Get the icon closest to the desired preview size.
+  const gfx::ImageSkia* icon = image.Get(kIconPreviewSizePixels,
+                                         kIconPreviewSizePixels);
+  if (!icon)
+    // The family has no icons. Leave the image blank.
     return;
-
-  // image contains a single ImageSkia with all of the icons at different sizes.
-  // Create a new ImageSkia with just a single icon at the preferred size.
-  const gfx::ImageSkia& multires_image_skia = *(image.ToImageSkia());
-  std::vector<gfx::ImageSkiaRep> image_reps = multires_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. An icon's size
-  // is measured as the minimum of its width and height.
-  const gfx::ImageSkiaRep* smallest_larger = NULL;
-  const gfx::ImageSkiaRep* largest_smaller = NULL;
-  int smallest_larger_size = 0;
-  int largest_smaller_size = 0;
-  for (std::vector<gfx::ImageSkiaRep>::const_iterator it = image_reps.begin();
-       it != image_reps.end(); ++it) {
-    const gfx::ImageSkiaRep& image = *it;
-    int image_size = std::min(image.pixel_width(), image.pixel_height());
-    if (image_size >= kIconPreviewSizePixels) {
-      if (!smallest_larger || image_size < smallest_larger_size) {
-        smallest_larger = &image;
-        smallest_larger_size = image_size;
-      }
-    } else {
-      if (!largest_smaller || image_size > largest_smaller_size) {
-        largest_smaller = &image;
-        largest_smaller_size = image_size;
-      }
-    }
-  }
-  if (!smallest_larger && !largest_smaller) {
-    // Should never happen unless the image has no representations.
-    return;
-  }
-  const SkBitmap& bitmap = smallest_larger ?
-                           smallest_larger->sk_bitmap() :
-                           largest_smaller->sk_bitmap();
+  const SkBitmap& bitmap = *icon->bitmap();
   if (bitmap.width() == kIconPreviewSizePixels &&
       bitmap.height() == kIconPreviewSizePixels) {
     icon_->SetImage(gfx::ImageSkia::CreateFrom1xBitmap(bitmap));
   } else {
     // Resize the image to the desired size.
     SkBitmap resized_bitmap = skia::ImageOperations::Resize(
         bitmap, skia::ImageOperations::RESIZE_LANCZOS3,
         kIconPreviewSizePixels, kIconPreviewSizePixels);
 
     icon_->SetImage(gfx::ImageSkia::CreateFrom1xBitmap(resized_bitmap));
@@ skipping 58 matching lines @@
       create_shortcuts_label_(NULL),
       desktop_check_box_(NULL),
       menu_check_box_(NULL),
       quick_launch_check_box_(NULL) {}
 
 CreateApplicationShortcutView::~CreateApplicationShortcutView() {}
 
 void CreateApplicationShortcutView::InitControls() {
   // Create controls
   app_info_ = new AppInfoView(shortcut_info_.title, shortcut_info_.description,
-      shortcut_info_.favicon.IsEmpty() ? SkBitmap() :
-                                         *shortcut_info_.favicon.ToSkBitmap());
+                              shortcut_info_.favicon);
   create_shortcuts_label_ = new views::Label(
       l10n_util::GetStringUTF16(IDS_CREATE_SHORTCUTS_LABEL));
   create_shortcuts_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
   desktop_check_box_ = AddCheckbox(
       l10n_util::GetStringUTF16(IDS_CREATE_SHORTCUTS_DESKTOP_CHKBOX),
       profile_->GetPrefs()->GetBoolean(prefs::kWebAppCreateOnDesktop));
 
   menu_check_box_ = NULL;
   quick_launch_check_box_ = NULL;
@@ skipping 165 matching lines @@
   InitControls();
 }
 
 CreateUrlApplicationShortcutView::~CreateUrlApplicationShortcutView() {
 }
 
 bool CreateUrlApplicationShortcutView::Accept() {
   if (!CreateApplicationShortcutView::Accept())
     return false;
 
-  extensions::TabHelper::FromWebContents(web_contents_)->
-      SetAppIcon(shortcut_info_.favicon.IsEmpty()
-          ? SkBitmap()
-          : *shortcut_info_.favicon.ToSkBitmap());
+  // Get the smallest icon in the icon family (should have only 1).
+  const gfx::ImageSkia* icon = shortcut_info_.favicon.Get(0, 0);
+  SkBitmap bitmap = icon ? *icon->bitmap() : SkBitmap();
+  extensions::TabHelper::FromWebContents(web_contents_)->SetAppIcon(bitmap);
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents_);
   if (browser)
     chrome::ConvertTabToAppWindow(browser, web_contents_);
   return true;
 }
 
 void CreateUrlApplicationShortcutView::FetchIcon() {
   // There should only be fetch job at a time.
   DCHECK_EQ(-1, pending_download_id_);
 
@@ skipping 27 matching lines @@
         web_contents_->GetRenderViewHost()->GetView()->GetNativeView());
     scale_factors.push_back(scale_factor);
     size_t closest_index = FaviconUtil::SelectBestFaviconFromBitmaps(
         bitmaps,
         scale_factors,
         requested_size);
     image = bitmaps[closest_index];
   }
 
   if (!image.isNull()) {
-    shortcut_info_.favicon = gfx::Image::CreateFrom1xBitmap(image);
+    shortcut_info_.favicon.Add(gfx::ImageSkia::CreateFrom1xBitmap(image));
     static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon);
   } else {
     FetchIcon();
   }
 }
 
 CreateChromeApplicationShortcutView::CreateChromeApplicationShortcutView(
     Profile* profile,
     const extensions::Extension* app) :
       CreateApplicationShortcutView(profile),
@@ skipping 15 matching lines @@
 CreateChromeApplicationShortcutView::~CreateChromeApplicationShortcutView() {}
 
 // Called when the app's ShortcutInfo (with icon) is loaded.
 void CreateChromeApplicationShortcutView::OnShortcutInfoLoaded(
     const ShellIntegration::ShortcutInfo& shortcut_info) {
   shortcut_info_ = shortcut_info;
 
   CHECK(app_info_);
   static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon);
 }