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

chrome/browser/shell_integration_linux.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/shell_integration_linux.h"
 
 #include <fcntl.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <sys/stat.h>
@@ skipping 18 matching lines @@
 #include "base/strings/string_tokenizer.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/codec/png_codec.h"
-#include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/image/image_skia_rep.h"
+#include "ui/gfx/icon_family.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // Helper to launch xdg scripts. We don't want them to ask any questions on the
 // terminal etc. The function returns true if the utility launches and exits
 // cleanly, in which case |exit_code| returns the utility's exit code.
 bool LaunchXdgUtility(const std::vector<std::string>& argv, int* exit_code) {
   // xdg-settings internally runs xdg-mime, which uses mv to move newly-created
@@ skipping 17 matching lines @@
     return false;
   }
   close(devnull);
 
   return base::WaitForExitCode(handle, exit_code);
 }
 
 std::string CreateShortcutIcon(
     const ShellIntegration::ShortcutInfo& shortcut_info,
     const base::FilePath& shortcut_filename) {
-  if (shortcut_info.favicon.IsEmpty())
+  if (shortcut_info.favicon.empty())
     return std::string();
 
   // TODO(phajdan.jr): Report errors from this function, possibly as infobars.
   base::ScopedTempDir temp_dir;
   if (!temp_dir.CreateUniqueTempDir())
     return std::string();
 
   base::FilePath temp_file_path = temp_dir.path().Append(
       shortcut_filename.ReplaceExtension("png"));
   std::string icon_name = temp_file_path.BaseName().RemoveExtension().value();
 
-  std::vector<gfx::ImageSkiaRep> image_reps =
-      shortcut_info.favicon.ToImageSkia()->image_reps();
-  for (std::vector<gfx::ImageSkiaRep>::const_iterator it = image_reps.begin();
-       it != image_reps.end(); ++it) {
+  for (gfx::IconFamily::const_iterator it = shortcut_info.favicon.begin();
+       it != shortcut_info.favicon.end(); ++it) {
     std::vector<unsigned char> png_data;
-    const SkBitmap& bitmap = it->sk_bitmap();
+    int size = it->first;
+    const SkBitmap& bitmap = *it->second.bitmap();
     if (!gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, false, &png_data)) {
       // If the bitmap could not be encoded to PNG format, skip it.
       LOG(WARNING) << "Could not encode icon " << icon_name << ".png at size "
-                   << bitmap.width() << ".";
+                   << size << ".";
       continue;
     }
     int bytes_written = file_util::WriteFile(temp_file_path,
         reinterpret_cast<char*>(png_data.data()), png_data.size());
 
     if (bytes_written != static_cast<int>(png_data.size()))
       return std::string();
 
     std::vector<std::string> argv;
     argv.push_back("xdg-icon-resource");
     argv.push_back("install");
 
     // Always install in user mode, even if someone runs the browser as root
     // (people do that).
     argv.push_back("--mode");
     argv.push_back("user");
 
     argv.push_back("--size");
-    argv.push_back(base::IntToString(bitmap.width()));
+    argv.push_back(base::IntToString(size));
 
     argv.push_back(temp_file_path.value());
     argv.push_back(icon_name);
     int exit_code;
     if (!LaunchXdgUtility(argv, &exit_code) || exit_code) {
       LOG(WARNING) << "Could not install icon " << icon_name << ".png at size "
-                   << bitmap.width() << ".";
+                   << size << ".";
     }
   }
   return icon_name;
 }
 
 bool CreateShortcutOnDesktop(const base::FilePath& shortcut_filename,
                              const std::string& contents) {
   // Make sure that we will later call openat in a secure way.
   DCHECK_EQ(shortcut_filename.BaseName().value(), shortcut_filename.value());
 
@@ skipping 703 matching lines @@
 
   base::FilePath shortcut_filename = GetExtensionShortcutFilename(
       profile_path, extension_id);
   DCHECK(!shortcut_filename.empty());
 
   DeleteShortcutOnDesktop(shortcut_filename);
   DeleteShortcutInApplicationsMenu(shortcut_filename);
 }
 
 }  // namespace ShellIntegrationLinux