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

chrome/browser/web_applications/web_app_win.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/web_applications/web_app.h"
 
 #include <shlobj.h>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/md5.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/shortcut.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/launcher_support/chrome_launcher_support.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/gfx/icon_util.h"
+#include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_family.h"
 
 namespace {
 
 const base::FilePath::CharType kIconChecksumFileExt[] =
     FILE_PATH_LITERAL(".ico.md5");
 
+// Width and height of icons exported to .ico files.
+// TODO(mgiuca): Remove when icon_util has the capability to save all icon
+// sizes, not just a single particular size.
+const int kIconExportSize = 32;
+
 // Calculates image checksum using MD5.
 void GetImageCheckSum(const SkBitmap& image, base::MD5Digest* digest) {
   DCHECK(digest);
 
   SkAutoLockPixels image_lock(image);
   MD5Sum(image.getPixels(), image.getSize(), digest);
 }
 
 // Saves |image| as an |icon_file| with the checksum.
 bool SaveIconWithCheckSum(const base::FilePath& icon_file,
@@ skipping 127 matching lines @@
 
 }  // namespace
 
 namespace web_app {
 
 namespace internals {
 
 // Saves |image| to |icon_file| if the file is outdated and refresh shell's
 // icon cache to ensure correct icon is displayed. Returns true if icon_file
 // is up to date or successfully updated.
-bool CheckAndSaveIcon(const base::FilePath& icon_file, const SkBitmap& image) {
-  if (ShouldUpdateIcon(icon_file, image)) {
-    if (SaveIconWithCheckSum(icon_file, image)) {
+bool CheckAndSaveIcon(const base::FilePath& icon_file,
+                      const gfx::ImageFamily& image) {
+  // TODO(mgiuca): Save an icon with all icon sizes, not just an icon at a
+  // hard-coded fixed size. http://crbug.com/163864.
+  const gfx::Image* icon = image.GetBest(kIconExportSize, kIconExportSize);
+  SkBitmap bitmap = icon ? icon->AsBitmap() : SkBitmap();

[Robert Sesek, 2013/04/08 13:16:39]

If the icon is empty, return false early?

[Matt Giuca, 2013/04/09 00:00:45]

Returning false is supposed to occur only if there was a problem. Note that the
caller aborts saving the shortcut if this returns false. Saving an empty icon
isn't a serious problem, so I think we should continue with an empty bitmap.

+  if (ShouldUpdateIcon(icon_file, bitmap)) {
+    if (SaveIconWithCheckSum(icon_file, bitmap)) {
       // Refresh shell's icon cache. This call is quite disruptive as user would
       // see explorer rebuilding the icon cache. It would be great that we find
       // a better way to achieve this.
       SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST | SHCNF_FLUSHNOWAIT,
                      NULL, NULL);
     } else {
       return false;
     }
   }
 
@@ skipping 40 matching lines @@
     return false;
   }
 
   // Generates file name to use with persisted ico and shortcut file.
   base::FilePath file_name =
       web_app::internals::GetSanitizedFileName(shortcut_info.title);
 
   // Creates an ico file to use with shortcut.
   base::FilePath icon_file = web_app_path.Append(file_name).AddExtension(
       FILE_PATH_LITERAL(".ico"));
-  if (!web_app::internals::CheckAndSaveIcon(icon_file,
-        *shortcut_info.favicon.ToSkBitmap())) {
+  if (!web_app::internals::CheckAndSaveIcon(icon_file, shortcut_info.favicon)) {
     return false;
   }
 
   base::FilePath target_exe = GetShortcutExecutablePath(shortcut_info);
   DCHECK(!target_exe.empty());
 
   // Working directory.
   base::FilePath working_dir(target_exe.DirName());
 
   CommandLine cmd_line(CommandLine::NO_PROGRAM);
@@ skipping 61 matching lines @@
     const ShellIntegration::ShortcutInfo& shortcut_info) {
   // Generates file name to use with persisted ico and shortcut file.
   base::FilePath file_name =
       web_app::internals::GetSanitizedFileName(shortcut_info.title);
 
   // If an icon file exists, and is out of date, replace it with the new icon
   // and let the shell know the icon has been modified.
   base::FilePath icon_file = web_app_path.Append(file_name).AddExtension(
       FILE_PATH_LITERAL(".ico"));
   if (file_util::PathExists(icon_file)) {
-    web_app::internals::CheckAndSaveIcon(icon_file,
-        *shortcut_info.favicon.ToSkBitmap());
+    web_app::internals::CheckAndSaveIcon(icon_file, shortcut_info.favicon);
   }
 }
 
 void DeletePlatformShortcuts(
     const base::FilePath& web_app_path,
     const ShellIntegration::ShortcutInfo& shortcut_info) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
 
   // Get all possible locations for shortcuts.
   ShellIntegration::ShortcutLocations all_shortcut_locations;
@@ skipping 16 matching lines @@
       // they are all unpinned.
       base::win::TaskbarUnpinShortcutLink(j->value().c_str());
       file_util::Delete(*j, false);
     }
   }
 }
 
 }  // namespace internals
 
 }  // namespace web_app