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

chrome/browser/ui/views/extensions/native_app_window_views.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/extensions/native_app_window_views.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/threading/sequenced_worker_pool.h"
@@ skipping 87 matching lines @@
   }
   command_line.SetProgram(CommandLine::ForCurrentProcess()->GetProgram());
   ui::win::SetRelaunchDetailsForWindow(command_line.GetCommandLineString(),
       shortcut_info.title, hwnd);
 
   if (!file_util::PathExists(web_app_path) &&
       !file_util::CreateDirectory(web_app_path)) {
     return;
   }
   ui::win::SetAppIconForWindow(icon_file.value(), hwnd);
-  web_app::internals::CheckAndSaveIcon(icon_file,
-                                       *shortcut_info.favicon.ToSkBitmap());
+  web_app::internals::CheckAndSaveIcon(icon_file, shortcut_info.favicon);
 }
 #endif
 
 }  // namespace
 
 NativeAppWindowViews::NativeAppWindowViews(
     ShellWindow* shell_window,
     const ShellWindow::CreateParams& create_params)
     : shell_window_(shell_window),
       web_view_(NULL),
@@ skipping 579 matching lines @@
 }
 
 //------------------------------------------------------------------------------
 // NativeAppWindow::Create
 
 // static
 NativeAppWindow* NativeAppWindow::Create(
     ShellWindow* shell_window, const ShellWindow::CreateParams& params) {
   return new NativeAppWindowViews(shell_window, params);
 }