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

Unified Diff: content/browser/frame_host/navigation_controller_android.cc

Issue 1232123009: customtabs: Pre-create a renderer in mayLaunchUrl(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 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/frame_host/navigation_controller_android.cc
diff --git a/content/browser/frame_host/navigation_controller_android.cc b/content/browser/frame_host/navigation_controller_android.cc
index 686403eb6518499bb0e4b3313f513fdac00fefcf..6b87d93d8cb75b2dc076a535708da7cac12c5da5 100644
--- a/content/browser/frame_host/navigation_controller_android.cc
+++ b/content/browser/frame_host/navigation_controller_android.cc
@@ -161,20 +161,22 @@ void NavigationControllerAndroid::GoToNavigationIndex(JNIEnv* env,
navigation_controller_->GoToIndex(index);
}
-void NavigationControllerAndroid::LoadUrl(JNIEnv* env,
- jobject obj,
- jstring url,
- jint load_url_type,
- jint transition_type,
- jstring j_referrer_url,
- jint referrer_policy,
- jint ua_override_option,
- jstring extra_headers,
- jbyteArray post_data,
- jstring base_url_for_data_url,
- jstring virtual_url_for_data_url,
- jboolean can_load_local_resources,
- jboolean is_renderer_initiated) {
+void NavigationControllerAndroid::LoadUrl(
+ JNIEnv* env,
+ jobject obj,
+ jstring url,
+ jint load_url_type,
+ jint transition_type,
+ jstring j_referrer_url,
+ jint referrer_policy,
+ jint ua_override_option,
+ jstring extra_headers,
+ jbyteArray post_data,
+ jstring base_url_for_data_url,
+ jstring virtual_url_for_data_url,
+ jboolean can_load_local_resources,
+ jboolean is_renderer_initiated,
+ jboolean should_replace_current_entry) {
DCHECK(url);
NavigationController::LoadURLParams params(
GURL(ConvertJavaStringToUTF8(env, url)));
@@ -187,6 +189,7 @@ void NavigationControllerAndroid::LoadUrl(JNIEnv* env,
ua_override_option);
params.can_load_local_resources = can_load_local_resources;
params.is_renderer_initiated = is_renderer_initiated;
+ params.should_replace_current_entry = should_replace_current_entry;
if (extra_headers)
params.extra_headers = ConvertJavaStringToUTF8(env, extra_headers);

Powered by Google App Engine
This is Rietveld 408576698