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

chrome/browser/ui/webui/ntp/app_launcher_handler.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_UI_WEBUI_NTP_APP_LAUNCHER_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_NTP_APP_LAUNCHER_HANDLER_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 137 matching lines @@
   // Returns the ExtensionUninstallDialog object for this class, creating it if
   // needed.
   ExtensionUninstallDialog* GetExtensionUninstallDialog();
 
   // Returns the ExtensionInstallPrompt object for this class, creating it if
   // needed.
   ExtensionInstallPrompt* GetExtensionInstallPrompt();
 
   // Continuation for installing a bookmark app after favicon lookup.
   void OnFaviconForApp(FaviconService::Handle handle,
-                       history::FaviconData data);
+                       const history::FaviconImageResult& image_result);
 
   // Sends |highlight_app_id_| to the js.
   void SetAppToBeHighlighted();
 
   // The apps are represented in the extensions model, which
   // outlives us since it's owned by our containing profile.
   ExtensionService* const extension_service_;
 
   // We monitor changes to the extension system so that we can reload the apps
   // when necessary.
@@ skipping 30 matching lines @@
   // when the app is added to the page (via getAppsCallback or appAdded).
   std::string highlight_app_id_;
 
   // Hold state for favicon requests.
   CancelableRequestConsumerTSimple<AppInstallInfo*> favicon_consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(AppLauncherHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_NTP_APP_LAUNCHER_HANDLER_H_