chrome/browser/prerender/prerender_manager.cc - Issue 6672065: Support touch icon in FaviconHelper

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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:

Index: chrome/browser/prerender/prerender_manager.cc

diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc

index 4246d8f831c3d18650a5183376c27ed81aeca94e..3b9e15865a633ffd6b4e703c3ba58eb7d9678c60 100644

--- a/chrome/browser/prerender/prerender_manager.cc

+++ b/chrome/browser/prerender/prerender_manager.cc

@@ -337,8 +337,12 @@ 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()) {

+ LOG(INFO) << "MaybeUsePreloadedPage";

+ 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();