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

chrome/browser/favicon/favicon_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_FAVICON_FAVICON_HANDLER_H_
 #define CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 120 matching lines @@
 
   // Asks the render to download favicon, returns the request id.
   virtual int DownloadFavicon(const GURL& image_url, int image_size);
 
   // Ask the favicon from history
   virtual void UpdateFaviconMappingAndFetch(
       const GURL& page_url,
       const GURL& icon_url,
       history::IconType icon_type,
       CancelableRequestConsumerBase* consumer,
-      const FaviconService::FaviconDataCallback& callback);
+      const FaviconService::FaviconResultsCallback& callback);
 
   virtual void GetFavicon(
       const GURL& icon_url,
       history::IconType icon_type,
       CancelableRequestConsumerBase* consumer,
-      const FaviconService::FaviconDataCallback& callback);
+      const FaviconService::FaviconResultsCallback& callback);
 
   virtual void GetFaviconForURL(
       const GURL& page_url,
       int icon_types,
       CancelableRequestConsumerBase* consumer,
-      const FaviconService::FaviconDataCallback& callback);
+      const FaviconService::FaviconResultsCallback& callback);
 
   virtual void SetHistoryFavicon(const GURL& page_url,
                                  const GURL& icon_url,
                                  const std::vector<unsigned char>& image_data,
                                  history::IconType icon_type);
 
   virtual FaviconService* GetFaviconService();
 
   // Returns true if the favicon should be saved.
   virtual bool ShouldSaveFavicon(const GURL& url);
@@ skipping 27 matching lines @@
                      history::IconType icon_type);
 
     GURL url;
     GURL image_url;
     gfx::Image image;
     float score;
     history::IconType icon_type;
   };
 
   // See description above class for details.
-  void OnFaviconDataForInitialURL(FaviconService::Handle handle,
-                                  history::FaviconData favicon);
+  void OnFaviconDataForInitialURL(
+      FaviconService::Handle handle,
+      std::vector<history::FaviconBitmapResult> favicon_bitmap_results,
+      history::IconURLSizesMap icon_url_sizes);
 
   // If the favicon has expired, asks the renderer to download the favicon.
   // Otherwise asks history to update the mapping between page url and icon
   // url with a callback to OnFaviconData when done.
   void DownloadFaviconOrAskHistory(const GURL& page_url,
                                    const GURL& icon_url,
                                    history::IconType icon_type);
 
   // See description above class for details.
-  void OnFaviconData(FaviconService::Handle handle,
-                     history::FaviconData favicon);
+  void OnFaviconData(
+      FaviconService::Handle handle,
+      std::vector<history::FaviconBitmapResult> favicon_bitmap_results,
+      history::IconURLSizesMap icon_url_sizes);
 
   // Schedules a download for the specified entry. This adds the request to
   // download_requests_.
   int ScheduleDownload(const GURL& url,
                        const GURL& image_url,
                        int image_size,
                        history::IconType icon_type,
                        const FaviconTabHelper::ImageDownloadCallback& callback);
 
   // Updates |favicon_candidate_| and returns true if it is an exact match.
@@ skipping 54 matching lines @@
   // Requests to the renderer to download favicons.
   typedef std::map<int, DownloadRequest> DownloadRequests;
   DownloadRequests download_requests_;
 
   // The combination of the supported icon types.
   const int icon_types_;
 
   // The prioritized favicon candidates from the page back from the renderer.
   std::deque<FaviconURL> image_urls_;
 
-  // The FaviconData from history.
-  history::FaviconData history_icon_;
+  // The FaviconBitmapResults from history.
+  std::vector<history::FaviconBitmapResult> history_results_;
 
   // The Profile associated with this handler.
   Profile* profile_;
 
   // This handler's delegate.
   FaviconHandlerDelegate* delegate_;  // weak
 
   // Current favicon candidate.
   FaviconCandidate favicon_candidate_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconHandler);
 };
 
 #endif  // CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_