diff options
| author | dtrainor@chromium.org <dtrainor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 17:44:30 +0000 |
|---|---|---|
| committer | dtrainor@chromium.org <dtrainor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 17:44:30 +0000 |
| commit | 98a50b76141f0b14f292f49ce376e6554142d5e2 (patch) | |
| tree | 3025fd17233725e0c77d5c7898124ea9a7c4f74e /content/browser/android | |
| parent | daf88e5b295b56718c391da32700069762142d18 (diff) | |
| download | chromium_src-98a50b76141f0b14f292f49ce376e6554142d5e2.zip chromium_src-98a50b76141f0b14f292f49ce376e6554142d5e2.tar.gz chromium_src-98a50b76141f0b14f292f49ce376e6554142d5e2.tar.bz2 | |
Use LoadURLWithParams in ChromeWebContentsDelegateAndroid
Build a LoadURLParams object from the OpenURLParams and properly set all
parameters on that object when calling into NavigationController. This makes
sure we set the correct state for the load.
BUG=352083
Review URL: https://codereview.chromium.org/267253007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273865 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/android')
| -rw-r--r-- | content/browser/android/content_view_core_impl.cc | 5 | ||||
| -rw-r--r-- | content/browser/android/content_view_core_impl.h | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc index 61b7281..35e2709 100644 --- a/content/browser/android/content_view_core_impl.cc +++ b/content/browser/android/content_view_core_impl.cc @@ -848,7 +848,8 @@ void ContentViewCoreImpl::LoadUrl( jbyteArray post_data, jstring base_url_for_data_url, jstring virtual_url_for_data_url, - jboolean can_load_local_resources) { + jboolean can_load_local_resources, + jboolean is_renderer_initiated) { DCHECK(url); NavigationController::LoadURLParams params( GURL(ConvertJavaStringToUTF8(env, url))); @@ -887,6 +888,8 @@ void ContentViewCoreImpl::LoadUrl( static_cast<blink::WebReferrerPolicy>(referrer_policy)); } + params.is_renderer_initiated = is_renderer_initiated; + LoadUrl(params); } diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h index cabfac0..919dad8 100644 --- a/content/browser/android/content_view_core_impl.h +++ b/content/browser/android/content_view_core_impl.h @@ -88,7 +88,8 @@ class ContentViewCoreImpl : public ContentViewCore, jbyteArray post_data, jstring base_url_for_data_url, jstring virtual_url_for_data_url, - jboolean can_load_local_resources); + jboolean can_load_local_resources, + jboolean is_renderer_initiated); base::android::ScopedJavaLocalRef<jstring> GetURL(JNIEnv* env, jobject) const; jboolean IsIncognito(JNIEnv* env, jobject obj); void SendOrientationChangeEvent(JNIEnv* env, jobject obj, jint orientation); |