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

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

Issue 6171007: For prerendering, keep track of all the intermediate redirects, and hook into... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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
===================================================================
--- chrome/browser/prerender/prerender_manager.cc (revision 71703)
+++ chrome/browser/prerender/prerender_manager.cc (working copy)
@@ -39,7 +39,8 @@
}
}
-void PrerenderManager::AddPreload(const GURL& url) {
+void PrerenderManager::AddPreload(const GURL& url,
+ const std::vector<GURL>& alias_urls) {
DCHECK(CalledOnValidThread());
DeleteOldEntries();
// If the URL already exists in the set of preloaded URLs, don't do anything.
@@ -49,7 +50,7 @@
if (it->url_ == url)
return;
}
- PrerenderContentsData data(CreatePrerenderContents(url),
+ PrerenderContentsData data(CreatePrerenderContents(url, alias_urls),
GetCurrentTime(), url);
prerender_list_.push_back(data);
data.contents_->StartPrerendering();
@@ -75,7 +76,8 @@
for (std::list<PrerenderContentsData>::iterator it = prerender_list_.begin();
it != prerender_list_.end();
++it) {
- if (it->url_ == url) {
+ PrerenderContents* pc = it->contents_;
+ if (pc->MatchesURL(url)) {
PrerenderContents* pc = it->contents_;
prerender_list_.erase(it);
return pc;
@@ -129,6 +131,8 @@
return (now - start < max_prerender_age_);
}
-PrerenderContents* PrerenderManager::CreatePrerenderContents(const GURL& url) {
- return new PrerenderContents(this, profile_, url);
+PrerenderContents* PrerenderManager::CreatePrerenderContents(
+ const GURL& url,
+ const std::vector<GURL>& alias_urls) {
+ return new PrerenderContents(this, profile_, url, alias_urls);
}
« no previous file with comments | « chrome/browser/prerender/prerender_manager.h ('k') | chrome/browser/prerender/prerender_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698