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

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

Issue 11411180: move favicon download code from chrome/ into content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix order Created 8 years 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 1cab97eed6ea7bf58e906bf79d7cfe39892a9370..8dbbf5365d822a92f8f2ff82f8b2b8e47272b21e 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -54,6 +54,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_delegate.h"
#include "content/public/browser/web_contents_view.h"
+#include "content/public/common/favicon_url.h"
using content::BrowserThread;
using content::RenderViewHost;
@@ -451,10 +452,10 @@ bool PrerenderManager::MaybeUsePrerenderedPage(WebContents* web_contents,
GURL icon_url = prerender_contents->icon_url();
if (!icon_url.is_empty()) {
- std::vector<FaviconURL> urls;
- urls.push_back(FaviconURL(icon_url, FaviconURL::FAVICON));
+ std::vector<content::FaviconURL> urls;
+ urls.push_back(content::FaviconURL(icon_url, content::FaviconURL::FAVICON));
FaviconTabHelper::FromWebContents(new_tab_contents->web_contents())->
- OnUpdateFaviconURL(prerender_contents->page_id(), urls);
+ DidUpdateFaviconURL(prerender_contents->page_id(), urls);
}
// Update PPLT metrics:
« no previous file with comments | « chrome/browser/prerender/prerender_contents.cc ('k') | chrome/browser/prerender/prerender_render_view_host_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698