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

Unified Diff: chrome/browser/prerender/prerender_resource_handler.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_resource_handler.cc
===================================================================
--- chrome/browser/prerender/prerender_resource_handler.cc (revision 71174)
+++ chrome/browser/prerender/prerender_resource_handler.cc (working copy)
@@ -100,8 +100,10 @@
bool* defer) {
bool will_redirect = next_handler_->OnRequestRedirected(
request_id, url, response, defer);
- if (will_redirect)
+ if (will_redirect) {
+ alias_urls_.push_back(url);
url_ = url;
+ }
return will_redirect;
}
@@ -117,7 +119,8 @@
NewRunnableMethod(
this,
&PrerenderResourceHandler::RunCallbackFromUIThread,
- url_));
+ url_,
+ alias_urls_));
}
return next_handler_->OnResponseStarted(request_id, response);
}
@@ -126,8 +129,10 @@
const GURL& url,
bool* defer) {
bool will_start = next_handler_->OnWillStart(request_id, url, defer);
- if (will_start)
+ if (will_start) {
+ alias_urls_.push_back(url);
url_ = url;
+ }
return will_start;
}
@@ -154,14 +159,18 @@
next_handler_->OnRequestClosed();
}
-void PrerenderResourceHandler::RunCallbackFromUIThread(const GURL& url) {
+void PrerenderResourceHandler::RunCallbackFromUIThread(const GURL& url,
+ const std::vector<GURL>&
+ alias_urls) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- prerender_callback_->Run(url);
+ prerender_callback_->Run(url, alias_urls);
}
-void PrerenderResourceHandler::StartPrerender(const GURL& url) {
+void PrerenderResourceHandler::StartPrerender(const GURL& url,
+ const std::vector<GURL>&
+ alias_urls) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- prerender_manager_->AddPreload(url);
+ prerender_manager_->AddPreload(url, alias_urls);
cbentzel 2011/01/12 23:49:53 It looks like url is going to be part of alias_url
tburkard 2011/01/13 19:14:16 Yes, that's fine. Doesn't harm to have it in ther
}
void PrerenderResourceHandler::set_prerender_duration(base::TimeDelta dt) {

Powered by Google App Engine
This is Rietveld 408576698