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

chrome/browser/shell_integration.h

 // 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.
 
 #ifndef CHROME_BROWSER_SHELL_INTEGRATION_H_
 #define CHROME_BROWSER_SHELL_INTEGRATION_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
-#include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_family.h"
 
 class CommandLine;
 
 class ShellIntegration {
  public:
   // Sets Chrome as the default browser (only for the current user). Returns
   // false if this operation fails.
   static bool SetAsDefaultBrowser();
 
   // Initiates an OS shell flow which (if followed by the user) should set
@@ skipping 68 matching lines @@
 
     GURL url;
     // If |extension_id| is non-empty, this is short cut is to an extension-app
     // and the launch url will be detected at start-up. In this case, |url|
     // is still used to generate the app id (windows app id, not chrome app id).
     std::string extension_id;
     bool is_platform_app;
     string16 title;
     string16 description;
     base::FilePath extension_path;
-    gfx::Image favicon;
+    gfx::ImageFamily favicon;
     base::FilePath profile_path;
   };
 
   // Info about which locations to create app shortcuts in.
   struct ShortcutLocations {
     ShortcutLocations();
 
     bool on_desktop;
     bool in_applications_menu;
 
@@ skipping 214 matching lines @@
     // Set Chrome as the default handler for this protocol.
     virtual bool SetAsDefault(bool interactive_permitted) OVERRIDE;
 
     std::string protocol_;
 
     DISALLOW_COPY_AND_ASSIGN(DefaultProtocolClientWorker);
   };
 };
 
 #endif  // CHROME_BROWSER_SHELL_INTEGRATION_H_