Change FaviconData to be able to return data for multiple bitmaps for same icon URL

chrome/browser/ui/webui/ntp/app_launcher_handler.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/webui/ntp/app_launcher_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/auto_reset.h"
@@ skipping 36 matching lines @@
 #include "chrome/common/web_apps.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_ui.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "ui/base/animation/animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/favicon_size.h"
 
 using application_launch::LaunchParams;
 using application_launch::OpenApplication;
 using content::WebContents;
 using extensions::CrxInstaller;
 using extensions::Extension;
 using extensions::ExtensionPrefs;
 
 namespace {
 
@@ skipping 630 matching lines @@
     LOG(ERROR) << "No favicon service";
     return;
   }
 
   scoped_ptr<AppInstallInfo> install_info(new AppInstallInfo());
   install_info->is_bookmark_app = true;
   install_info->title = title;
   install_info->app_url = launch_url;
   install_info->page_ordinal = page_ordinal;
 
-  FaviconService::Handle h = favicon_service->GetFaviconForURL(
-      profile, launch_url, history::FAVICON, &favicon_consumer_,
+  FaviconService::Handle h = favicon_service->GetFaviconImageForURL(
+      profile, launch_url, history::FAVICON, gfx::kFaviconSize,
+      &favicon_consumer_,
       base::Bind(&AppLauncherHandler::OnFaviconForApp, base::Unretained(this)));
   favicon_consumer_.SetClientData(favicon_service, h, install_info.release());
 }
 
 void AppLauncherHandler::HandleRecordAppLaunchByUrl(
     const base::ListValue* args) {
   std::string url;
   CHECK(args->GetString(0, &url));
   double source;
   CHECK(args->GetDouble(1, &source));
@@ skipping 28 matching lines @@
   CHECK(args->GetString(0, &extension_id));
   CHECK(args->GetBoolean(1, &disabled));
 
   const Extension* extension = extension_service_->GetExtensionById(
       extension_id, true);
   if (!extension)
     return;
   extension_service_->SetAppNotificationDisabled(extension_id, disabled);
 }
 
-void AppLauncherHandler::OnFaviconForApp(FaviconService::Handle handle,
-                                         history::FaviconData data) {
+void AppLauncherHandler::OnFaviconForApp(
+    FaviconService::Handle handle,
+    const history::FaviconImageResult& image_result) {
   scoped_ptr<AppInstallInfo> install_info(
       favicon_consumer_.GetClientDataForCurrentRequest());
   scoped_ptr<WebApplicationInfo> web_app(new WebApplicationInfo());
   web_app->is_bookmark_app = install_info->is_bookmark_app;
   web_app->title = install_info->title;
   web_app->app_url = install_info->app_url;
   web_app->urls.push_back(install_info->app_url);
 
   WebApplicationInfo::IconInfo icon;
-  web_app->icons.push_back(icon);
-  if (data.is_valid() && gfx::PNGCodec::Decode(data.image_data->front(),
-                                               data.image_data->size(),
-                                               &(web_app->icons[0].data))) {
-    web_app->icons[0].url = GURL();
-    web_app->icons[0].width = web_app->icons[0].data.width();
-    web_app->icons[0].height = web_app->icons[0].data.height();
-  } else {
-    web_app->icons.clear();

[sky, 2012/08/27 14:52:01]

Don't you need this else branch?

[pkotwicz, 2012/08/27 19:35:03]

|web_app| is constructed on line 761, so I don't think we need the else branch.

+  if (!image_result.image.IsEmpty()) {
+    icon.data = image_result.image.AsBitmap();
+    icon.width = icon.data.width();
+    icon.height = icon.data.height();
+    web_app->icons.push_back(icon);
   }
 
   scoped_refptr<CrxInstaller> installer(
       CrxInstaller::Create(extension_service_, NULL));
   installer->set_page_ordinal(install_info->page_ordinal);
   installer->InstallWebApp(*web_app);
   attempted_bookmark_app_install_ = true;
 }
 
 void AppLauncherHandler::SetAppToBeHighlighted() {
@@ skipping 154 matching lines @@
 
 ExtensionInstallPrompt* AppLauncherHandler::GetExtensionInstallPrompt() {
   if (!extension_install_ui_.get()) {
     Browser* browser = browser::FindBrowserWithWebContents(
         web_ui()->GetWebContents());
     extension_install_ui_.reset(
         chrome::CreateExtensionInstallPromptWithBrowser(browser));
   }
   return extension_install_ui_.get();
 }