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 736 matching lines @@
   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) {
+                                         history::FaviconData data,
+                                         std::vector<GURL> icon_urls_in_db) {
   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 {
+  bool bitmap_data_valid = false;
+  if (data.has_valid_bitmaps()) {
+    scoped_refptr<base::RefCountedMemory> bitmap_data(data.first_bitmap());
+    if (gfx::PNGCodec::Decode(bitmap_data->front(), bitmap_data->size(),
+                              &(web_app->icons[0].data))) {
+      bitmap_data_valid = true;
+      web_app->icons[0].url = GURL();

[sky, 2012/08/23 15:50:38]

I realize your copying code, but is this line necessary?

+      web_app->icons[0].width = web_app->icons[0].data.width();
+      web_app->icons[0].height = web_app->icons[0].data.height();
+    }
+  }
+
+  if (!bitmap_data_valid)
     web_app->icons.clear();
-  }
 
   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() {
   if (highlight_app_id_.empty())
@@ skipping 153 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();
 }