Find Favicon in priority of icon_type.

chrome/browser/favicon/favicon_service.h

Index: chrome/browser/favicon/favicon_service.h
diff --git a/chrome/browser/favicon/favicon_service.h b/chrome/browser/favicon/favicon_service.h
index 692a6ebe74e1d570670da09befcfc51ec8658a50..4badee44e449018b5b31668820490df33b65ec6b 100644
--- a/chrome/browser/favicon/favicon_service.h
+++ b/chrome/browser/favicon/favicon_service.h
@@ -46,13 +46,29 @@ class FaviconService : public CancelableRequestProvider,
                         int desired_size_in_dip)
         : profile(profile),
           page_url(page_url),
-          icon_types(icon_types),
-          desired_size_in_dip(desired_size_in_dip) {}
+          desired_size_in_dip(desired_size_in_dip),
+          threshold_for_next_icon_types(0) {
+      icon_types_priority.push_back(icon_types);
+    }
+
+    // Used to get best fit icon with icon types priority, see
+    // HistoryService::GetFaviconsForURL.
+    FaviconForURLParams(Profile* profile,
+                        const GURL& page_url,
+                        const std::vector<int>& icon_types_priority,
+                        int desired_size_in_dip,
+                        int threshold_for_next_icon_types)
+        : profile(profile),
+          page_url(page_url),
+          icon_types_priority(icon_types_priority),
+          desired_size_in_dip(desired_size_in_dip),
+          threshold_for_next_icon_types(threshold_for_next_icon_types) {}
 
     Profile* profile;

[sky, 2013/10/10 20:35:12]

Since the new args are not clear you need to point folks at where the
documentation can be found.

[michaelbai, 2013/10/10 22:39:58]

I did it at line 54-55.

On 2013/10/10 20:35:12, sky wrote:

     GURL page_url;
-    int icon_types;
+    std::vector<int> icon_types_priority;
     int desired_size_in_dip;
+    int threshold_for_next_icon_types;
   };
 
   // Callback for GetFaviconImage() and GetFaviconImageForURL().