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

Unified Diff: content/browser/android/content_view_core_impl.cc

Issue 10830144: Consolidate all NavigationController::LoadURL and family functions (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: NOTREACHED checks for post/data loads. 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
Index: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index f50b048c97c9dc96cae95ecff48cda792ad41937..b4a37add933acde6a7a7c654bcd6a659c47169d8 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -415,10 +415,15 @@ void ContentViewCoreImpl::LoadUrlWithUserAgentOverride(
const std::string& user_agent_override) {
web_contents()->SetUserAgentOverride(user_agent_override);
bool is_overriding_user_agent(!user_agent_override.empty());
- content::Referrer referer;
- web_contents()->GetController().LoadURLWithUserAgentOverride(
- url, referer, content::PageTransitionFromInt(page_transition),
- false, std::string(), is_overriding_user_agent);
+
+ content::NavigationController::LoadURLParams load_url_params(url);
+ load_url_params.transition_type =
+ content::PageTransitionFromInt(page_transition);
+ load_url_params.should_inherit_user_agent_override = false;
+ load_url_params.is_overriding_user_agent = is_overriding_user_agent;
+
+ web_contents()->GetController().LoadURLWithParams(load_url_params);
+
PostLoadUrl(url);
}

Powered by Google App Engine
This is Rietveld 408576698