Adds support for saving favicon size into history database.

chrome/browser/favicon/favicon_service.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_SERVICE_H_
 #define CHROME_BROWSER_FAVICON_FAVICON_SERVICE_H_
 
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 13 matching lines @@
 class FaviconService : public CancelableRequestProvider {
  public:
   explicit FaviconService(Profile* profile);
 
   virtual ~FaviconService();
 
   // Callback for GetFavicon. If we have previously inquired about the favicon
   // for this URL, |know_favicon| will be true, and the rest of the fields will
   // be valid (otherwise they will be ignored).
   //
-  // On |know_favicon| == true, |data| will either contain the PNG encoded
-  // favicon data, or it will be NULL to indicate that the site does not have
-  // a favicon (in other words, we know the site doesn't have a favicon, as
-  // opposed to not knowing anything). |expired| will be set to true if we
-  // refreshed the favicon "too long" ago and should be updated if the page
-  // is visited again.
+  // On |know_favicon| == true, |icon_url_sizes| will be set to a mapping of
+  // all the favicons associated with the requested page to the sizes available
+  // at each icon url.
+  // |know_favicon| will be true, and |icon_url_sizes| will be empty if we know
+  // that the site does not have a favicon.
+  // Each entry in |elements| represents a favicon bitmap at a different pixel
+  // size. If a |pixel_size| parameter was passed in order to get the favicon
+  // data, |elements| will have a single entry with the best match for
+  // |pixel_size|.
+  // |expired| will be set to true if we refreshed the favicon "too long" ago
+  // and should be updated if the page is visited again.
   typedef base::Callback<
       void(Handle,  // handle
            history::FaviconData)>  // the type of favicon
       FaviconDataCallback;
 
   typedef CancelableRequest<FaviconDataCallback> GetFaviconRequest;
 
   // Requests the |icon_type| of favicon. |consumer| is notified when the bits
   // have been fetched. |icon_url| is the URL of the icon itself, e.g.
   // <http://www.google.com/favicon.ico>.
@@ skipping 19 matching lines @@
   // priority of TOUCH_PRECOMPOSED_ICON, TOUCH_ICON and FAVICON.
   //
   // Note: this version is intended to be used to retrieve the favicon of a
   // page that has been browsed in the past. |expired| in the callback is
   // always false.
   Handle GetFaviconForURL(const GURL& page_url,
                           int icon_types,
                           CancelableRequestConsumerBase* consumer,
                           const FaviconDataCallback& callback);
 
-  // Requests the favicon for |favicon_id|. The |consumer| is notified when the
-  // bits have been fetched.
-  Handle GetFaviconForID(history::FaviconID favicon_id,
-                         CancelableRequestConsumerBase* consumer,
-                         const FaviconDataCallback& callback);
-
   // Marks all types of favicon for the page as being out of date.
   void SetFaviconOutOfDateForPage(const GURL& page_url);
 
   // Clones all icons from an existing page. This associates the icons from
   // |old_page_url| with |new_page_url|, provided |new_page_url| has no
   // recorded associations to any other icons.
   // Needed if you want to declare favicons (tentatively) in advance, before a
   // page is ever visited.
   void CloneFavicon(const GURL& old_page_url, const GURL& new_page_url);
 
@@ skipping 12 matching lines @@
  private:
   Profile* profile_;
 
   // Helper to forward an empty result if we cannot get the history service.
   void ForwardEmptyResultAsync(GetFaviconRequest* request);
 
   DISALLOW_COPY_AND_ASSIGN(FaviconService);
 };
 
 #endif  // CHROME_BROWSER_FAVICON_FAVICON_SERVICE_H_