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 | 11 |
12 namespace navigation_interception { | 12 namespace navigation_interception { |
13 | 13 |
14 base::android::ScopedJavaLocalRef<jobject> CreateJavaNavigationParams( | 14 base::android::ScopedJavaLocalRef<jobject> CreateJavaNavigationParams( |
15 JNIEnv* env, | 15 JNIEnv* env, |
16 const NavigationParams& params, | 16 const NavigationParams& params, |
17 bool has_user_gesture_carryover) { | 17 bool has_user_gesture_carryover) { |
18 ScopedJavaLocalRef<jstring> jstring_url = | 18 ScopedJavaLocalRef<jstring> jstring_url = |
19 ConvertUTF8ToJavaString(env, params.url().spec()); | 19 ConvertUTF8ToJavaString(env, params.url().spec()); |
20 | 20 |
21 return Java_NavigationParams_create( | 21 return Java_NavigationParams_create( |
22 env, jstring_url.obj(), params.is_post(), params.has_user_gesture(), | 22 env, jstring_url.obj(), params.is_post(), params.has_user_gesture(), |
23 params.transition_type(), params.is_redirect(), | 23 params.transition_type(), params.is_redirect(), |
24 params.is_external_protocol(), has_user_gesture_carryover); | 24 params.is_external_protocol(), params.is_main_frame(), |
| 25 has_user_gesture_carryover); |
25 } | 26 } |
26 | 27 |
27 // Register native methods. | 28 // Register native methods. |
28 | 29 |
29 bool RegisterNavigationParams(JNIEnv* env) { | 30 bool RegisterNavigationParams(JNIEnv* env) { |
30 return RegisterNativesImpl(env); | 31 return RegisterNativesImpl(env); |
31 } | 32 } |
32 | 33 |
33 } // namespace navigation_interception | 34 } // namespace navigation_interception |
OLD | NEW |