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

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

Issue 6672065: Support touch icon in FaviconHelper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reset candidates when FaviconURL is updated 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_manager.cc
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index 95d3ba1a5975bbccf34672d10e7f228386219766..2c6e579788ecedac9749155116365f3f0fc7c55f 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -12,6 +12,7 @@
#include "chrome/browser/prerender/prerender_contents.h"
#include "chrome/browser/prerender/prerender_final_status.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/icon_messages.h"
#include "chrome/common/render_messages.h"
#include "content/browser/browser_thread.h"
#include "content/browser/renderer_host/render_view_host.h"
@@ -182,9 +183,11 @@ bool PrerenderManager::MaybeUsePreloadedPage(TabContents* tc, const GURL& url) {
tc->UpdateTitle(rvh, pc->page_id(), UTF16ToWideHack(title));
GURL icon_url = pc->icon_url();
- if (!icon_url.is_empty())
- tc->favicon_helper().OnUpdateFaviconURL(pc->page_id(), icon_url);
-
+ if (!icon_url.is_empty()) {
+ std::vector<FaviconURL> urls;
+ urls.push_back(FaviconURL(icon_url, FAVICON));
+ tc->favicon_helper().OnUpdateFaviconURL(pc->page_id(), urls);
+ }
if (pc->has_stopped_loading())
tc->DidStopLoading();

Powered by Google App Engine
This is Rietveld 408576698