chrome/browser/prerender/prerender_contents.cc - Issue 10830144: Consolidate all NavigationController::LoadURL and family functions

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10830144: Consolidate all NavigationController::LoadURL and family functions (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: tri-state ui override. address comments Created 8 years, 4 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

« no previous file with comments | « chrome/browser/instant/instant_loader.cc ('k') | chrome/browser/ui/browser_navigator.cc » ('j') | content/browser/android/content_view_core_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prerender/prerender_contents.cc

diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc

index c148908ae8bd7b5b1f28d850d4460de8afc90e3d..030e51e1539fa5e4da023a8489d7e8e493412f93 100644

--- a/chrome/browser/prerender/prerender_contents.cc

+++ b/chrome/browser/prerender/prerender_contents.cc

@@ -370,14 +370,16 @@ void PrerenderContents::StartPrerendering(

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),

- false,

- std::string(),

- prerender_manager_->config().is_overriding_user_agent);

+ content::NavigationController::LoadURLParams load_url_params(

+ prerender_url_);

+ load_url_params.referrer = referrer_;

+ load_url_params.transition_type = (origin_ == ORIGIN_OMNIBOX ?

+ content::PAGE_TRANSITION_TYPED : content::PAGE_TRANSITION_LINK);

+ load_url_params.override_user_agent =

+ prerender_manager_->config().is_overriding_user_agent ?

+ content::NavigationController::UA_OVERRIDE_TRUE :

Charlie Reis 2012/08/03 23:12:48 The indent here is wrong. Should be 4 spaces for

boliu 2012/08/03 23:31:39 Done.

+ content::NavigationController::UA_OVERRIDE_FALSE;

+ new_contents->GetController().LoadURLWithParams(load_url_params);

}

bool PrerenderContents::GetChildId(int* child_id) const {

« no previous file with comments | « chrome/browser/instant/instant_loader.cc ('k') | chrome/browser/ui/browser_navigator.cc » ('j') | content/browser/android/content_view_core_impl.cc » ('J')