Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2661)

Unified Diff: chrome/browser/prerender/prerender_contents.cc

Issue 6672065: Support touch icon in FaviconHelper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix some style issues Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/prerender/prerender_contents.cc
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index 5313cf0503289e154957c57a31a83ba44be6018f..0779820ab2fa02a8e4c6980152c67c257a6760a4 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -409,8 +409,14 @@ void PrerenderContents::OnDidRedirectProvisionalLoad(int32 page_id,
}
void PrerenderContents::OnUpdateFaviconURL(int32 page_id,
- const GURL& icon_url) {
- icon_url_ = icon_url;
+ std::vector<FaviconURL> urls) {
+ for (std::vector<FaviconURL>::iterator i = urls.begin();
+ i != urls.end(); ++i) {
+ if (i->icon_type == FAVICON) {
+ icon_url_ = i->icon_url;
+ return;
+ }
+ }
}
bool PrerenderContents::AddAliasURL(const GURL& url) {

Powered by Google App Engine
This is Rietveld 408576698