OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "components/navigation_interception/navigation_params_android.h" | 5 #include "components/navigation_interception/navigation_params_android.h" |
6 | 6 |
7 #include "base/android/jni_string.h" | 7 #include "base/android/jni_string.h" |
8 #include "jni/NavigationParams_jni.h" | 8 #include "jni/NavigationParams_jni.h" |
9 | 9 |
10 using base::android::ConvertUTF8ToJavaString; | 10 using base::android::ConvertUTF8ToJavaString; |
11 using base::android::ScopedJavaLocalRef; | 11 using base::android::ScopedJavaLocalRef; |
12 | 12 |
13 namespace navigation_interception { | 13 namespace navigation_interception { |
14 | 14 |
15 base::android::ScopedJavaLocalRef<jobject> CreateJavaNavigationParams( | 15 base::android::ScopedJavaLocalRef<jobject> CreateJavaNavigationParams( |
16 JNIEnv* env, | 16 JNIEnv* env, |
17 const NavigationParams& params, | 17 const NavigationParams& params, |
18 bool has_user_gesture_carryover) { | 18 bool has_user_gesture_carryover) { |
19 const GURL& url = params.base_url_for_data_url().is_empty() | 19 const GURL& url = params.base_url_for_data_url().is_empty() |
20 ? params.url() | 20 ? params.url() |
21 : params.base_url_for_data_url(); | 21 : params.base_url_for_data_url(); |
22 DCHECK(params.base_url_for_data_url().is_empty() || | |
23 params.url().SchemeIs(url::kDataScheme)); | |
24 ScopedJavaLocalRef<jstring> jstring_url = | 22 ScopedJavaLocalRef<jstring> jstring_url = |
25 ConvertUTF8ToJavaString(env, url.spec()); | 23 ConvertUTF8ToJavaString(env, url.possibly_invalid_spec()); |
26 | 24 |
27 ScopedJavaLocalRef<jstring> jstring_referrer = | 25 ScopedJavaLocalRef<jstring> jstring_referrer = |
28 ConvertUTF8ToJavaString(env, params.referrer().url.spec()); | 26 ConvertUTF8ToJavaString(env, params.referrer().url.spec()); |
29 | 27 |
30 return Java_NavigationParams_create( | 28 return Java_NavigationParams_create( |
31 env, jstring_url, jstring_referrer, params.is_post(), | 29 env, jstring_url, jstring_referrer, params.is_post(), |
32 params.has_user_gesture(), params.transition_type(), params.is_redirect(), | 30 params.has_user_gesture(), params.transition_type(), params.is_redirect(), |
33 params.is_external_protocol(), params.is_main_frame(), | 31 params.is_external_protocol(), params.is_main_frame(), |
34 has_user_gesture_carryover); | 32 has_user_gesture_carryover); |
35 } | 33 } |
36 | 34 |
37 } // namespace navigation_interception | 35 } // namespace navigation_interception |
OLD | NEW |