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

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

Issue 10933065: Separate same domain and cross domain <link rel=...> prerenders for reporting. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fix pending prerenders Created 8 years, 3 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_contents.cc
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index 54ae9d016d323cdea5852991d649319fc19d92bc..d00dab52a469d9a61a5d3fe7e6b251c97d8dc4d3 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -190,11 +190,12 @@ class PrerenderContents::TabContentsDelegateImpl
void PrerenderContents::AddPendingPrerender(
const base::WeakPtr<PrerenderHandle> weak_prerender_handle,
+ const Origin origin,
dominich 2012/09/14 14:40:45 nit: no need for const here
const GURL& url,
const content::Referrer& referrer,
const gfx::Size& size) {
pending_prerenders_.push_back(
- PendingPrerenderInfo(weak_prerender_handle, url, referrer, size));
+ PendingPrerenderInfo(weak_prerender_handle, origin, url, referrer, size));
}
bool PrerenderContents::IsPendingEntry(
@@ -227,7 +228,7 @@ void PrerenderContents::StartPendingPrerenders() {
++it) {
if (it->weak_prerender_handle && it->weak_prerender_handle->IsValid()) {
prerender_manager_->StartPendingPrerender(
- it->weak_prerender_handle.get(), ORIGIN_LINK_REL_PRERENDER, child_id_,
+ it->weak_prerender_handle.get(), it->origin, child_id_,
it->url, it->referrer, it->size, session_storage_namespace);
}
}
@@ -235,10 +236,12 @@ void PrerenderContents::StartPendingPrerenders() {
PrerenderContents::PendingPrerenderInfo::PendingPrerenderInfo(
const base::WeakPtr<PrerenderHandle> weak_prerender_handle,
+ const Origin origin,
const GURL& url,
const content::Referrer& referrer,
const gfx::Size& size)
: weak_prerender_handle(weak_prerender_handle),
+ origin(origin),
url(url),
referrer(referrer),
size(size) {

Powered by Google App Engine
This is Rietveld 408576698