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

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

Issue 10450002: Transfer user agent override info between browser and renderer (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Default to not overriding in prerender config Created 8 years, 6 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 ce7e59a57cf90a326ec9e6cce4995d3d7951a01e..fa9e06de5fd8aa7711b995af32ba7eeda49a64ad 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -369,12 +369,18 @@ void PrerenderContents::StartPrerendering(
DCHECK(load_start_time_.is_null());
load_start_time_ = base::TimeTicks::Now();
- new_contents->GetController().LoadURL(
+ // Transfer over the user agent override.
+ new_contents->SetUserAgentOverride(
+ prerender_manager_->config().user_agent_override);
+
+ new_contents->GetController().LoadURLWithUserAgentOverride(
prerender_url_,
referrer_,
(origin_ == ORIGIN_OMNIBOX ? content::PAGE_TRANSITION_TYPED :
content::PAGE_TRANSITION_LINK),
- std::string());
+ false,
+ std::string(),
+ prerender_manager_->config().is_overriding_user_agent);
}
bool PrerenderContents::GetChildId(int* child_id) const {
« no previous file with comments | « chrome/browser/prerender/prerender_config.cc ('k') | content/browser/web_contents/navigation_controller_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698