Add support for multiple icon sizes for Mac platform apps

chrome/browser/ui/web_applications/web_app_ui.cc

 // Copyright (c) 2011 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/web_applications/web_app_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 144 matching lines @@
 void UpdateShortcutWorker::OnIconDownloaded(int download_id,
                                             bool errored,
                                             const SkBitmap& image) {
   if (tab_contents_ == NULL) {
     DeleteMe();  // We are done if underlying TabContents is gone.
     return;
   }
 
   if (!errored && !image.isNull()) {
     // Update icon with download image and update shortcut.
-    shortcut_info_.favicon = image;
+    shortcut_info_.favicon = gfx::Image(image);
     tab_contents_->extension_tab_helper()->SetAppIcon(image);
     UpdateShortcuts();
   } else {
     // Try the next icon otherwise.
     DownloadIcon();
   }
 }
 
 void UpdateShortcutWorker::CheckExistingShortcuts() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
@@ skipping 126 matching lines @@
   const WebApplicationInfo& app_info =
       tab_contents_wrapper->extension_tab_helper()->web_app_info();
 
   info->url = app_info.app_url.is_empty() ? web_contents->GetURL() :
                                             app_info.app_url;
   info->title = app_info.title.empty() ?
       (web_contents->GetTitle().empty() ? UTF8ToUTF16(info->url.spec()) :
                                           web_contents->GetTitle()) :
       app_info.title;
   info->description = app_info.description;
-  info->favicon = tab_contents_wrapper->favicon_tab_helper()->GetFavicon();
+  info->favicon =
+      gfx::Image(tab_contents_wrapper->favicon_tab_helper()->GetFavicon());
 }
 
 void UpdateShortcutForTabContents(TabContentsWrapper* tab_contents) {
 #if defined(OS_WIN)
   // UpdateShortcutWorker will delete itself when it's done.
   UpdateShortcutWorker* worker = new UpdateShortcutWorker(tab_contents);
   worker->Run();
 #endif  // defined(OS_WIN)
 }
 
 }  // namespace web_app