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

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 compile error for clank mac and unit test memory leak Created 9 years, 8 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
« no previous file with comments | « chrome/browser/prerender/prerender_contents.h ('k') | chrome/browser/prerender/prerender_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_contents.cc
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index c142f159881f75390482be7dbeb5bf376b5da973..6051d07757f17d4d63b1edb3dfb911c29f5dc4c7 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -448,9 +448,18 @@ void PrerenderContents::OnDidRedirectProvisionalLoad(int32 page_id,
Destroy(FINAL_STATUS_HTTPS);
}
-void PrerenderContents::OnUpdateFaviconURL(int32 page_id,
- const GURL& icon_url) {
- icon_url_ = icon_url;
+void PrerenderContents::OnUpdateFaviconURL(
+ int32 page_id,
+ const std::vector<FaviconURL>& urls) {
+ LOG(INFO) << "PrerenderContents::OnUpdateFaviconURL" << icon_url_;
+ for (std::vector<FaviconURL>::const_iterator i = urls.begin();
+ i != urls.end(); ++i) {
+ if (i->icon_type == FAVICON) {
+ icon_url_ = i->icon_url;
+ LOG(INFO) << icon_url_;
+ return;
+ }
+ }
}
void PrerenderContents::OnMaybeCancelPrerender(
« no previous file with comments | « chrome/browser/prerender/prerender_contents.h ('k') | chrome/browser/prerender/prerender_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698