diff options
| author | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-11 21:40:46 +0000 |
|---|---|---|
| committer | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-11 21:40:46 +0000 |
| commit | 351ef3bc6f4ef78a1a8a5e9ccf2bdf0e3ec38e65 (patch) | |
| tree | 15756795df3c94317f518cda23697ccacadea46a /chrome/browser/prerender/prerender_manager.cc | |
| parent | 639e57d0e1d79f996733d81285c6604314ca9cde (diff) | |
| download | chromium_src-351ef3bc6f4ef78a1a8a5e9ccf2bdf0e3ec38e65.zip chromium_src-351ef3bc6f4ef78a1a8a5e9ccf2bdf0e3ec38e65.tar.gz chromium_src-351ef3bc6f4ef78a1a8a5e9ccf2bdf0e3ec38e65.tar.bz2 | |
a Downloaded or retrieved favicon and touch in FaviconHelper.
b.ViewHostMsg_UpdateFaviconURL can update multiple icon urls
BUG=71571
TEST=Tested with existing unit test and add 2 new unit tests
Review URL: http://codereview.chromium.org/6672065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prerender/prerender_manager.cc')
| -rw-r--r-- | chrome/browser/prerender/prerender_manager.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc index 4246d8f..3b9e158 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(); |