OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "content/browser/frame_host/navigation_controller_android.h" | 5 #include "content/browser/frame_host/navigation_controller_android.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_array.h" | 8 #include "base/android/jni_array.h" |
9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
10 #include "content/browser/frame_host/navigation_entry_impl.h" | 10 #include "content/browser/frame_host/navigation_entry_impl.h" |
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
188 const JavaParamRef<jstring>& url, | 188 const JavaParamRef<jstring>& url, |
189 jint load_url_type, | 189 jint load_url_type, |
190 jint transition_type, | 190 jint transition_type, |
191 const JavaParamRef<jstring>& j_referrer_url, | 191 const JavaParamRef<jstring>& j_referrer_url, |
192 jint referrer_policy, | 192 jint referrer_policy, |
193 jint ua_override_option, | 193 jint ua_override_option, |
194 const JavaParamRef<jstring>& extra_headers, | 194 const JavaParamRef<jstring>& extra_headers, |
195 const JavaParamRef<jbyteArray>& post_data, | 195 const JavaParamRef<jbyteArray>& post_data, |
196 const JavaParamRef<jstring>& base_url_for_data_url, | 196 const JavaParamRef<jstring>& base_url_for_data_url, |
197 const JavaParamRef<jstring>& virtual_url_for_data_url, | 197 const JavaParamRef<jstring>& virtual_url_for_data_url, |
| 198 const JavaParamRef<jstring>& data_url_as_string, |
198 jboolean can_load_local_resources, | 199 jboolean can_load_local_resources, |
199 jboolean is_renderer_initiated, | 200 jboolean is_renderer_initiated, |
200 jboolean should_replace_current_entry) { | 201 jboolean should_replace_current_entry) { |
201 DCHECK(url); | 202 DCHECK(url); |
202 NavigationController::LoadURLParams params( | 203 NavigationController::LoadURLParams params( |
203 GURL(ConvertJavaStringToUTF8(env, url))); | 204 GURL(ConvertJavaStringToUTF8(env, url))); |
204 | 205 |
205 params.load_type = | 206 params.load_type = |
206 static_cast<NavigationController::LoadURLType>(load_url_type); | 207 static_cast<NavigationController::LoadURLType>(load_url_type); |
207 params.transition_type = ui::PageTransitionFromInt(transition_type); | 208 params.transition_type = ui::PageTransitionFromInt(transition_type); |
(...skipping 17 matching lines...) Expand all Loading... |
225 if (base_url_for_data_url) { | 226 if (base_url_for_data_url) { |
226 params.base_url_for_data_url = | 227 params.base_url_for_data_url = |
227 GURL(ConvertJavaStringToUTF8(env, base_url_for_data_url)); | 228 GURL(ConvertJavaStringToUTF8(env, base_url_for_data_url)); |
228 } | 229 } |
229 | 230 |
230 if (virtual_url_for_data_url) { | 231 if (virtual_url_for_data_url) { |
231 params.virtual_url_for_data_url = | 232 params.virtual_url_for_data_url = |
232 GURL(ConvertJavaStringToUTF8(env, virtual_url_for_data_url)); | 233 GURL(ConvertJavaStringToUTF8(env, virtual_url_for_data_url)); |
233 } | 234 } |
234 | 235 |
| 236 if (data_url_as_string) { |
| 237 params.data_url_as_string = |
| 238 ConvertJavaStringToUTF8(env, data_url_as_string); |
| 239 } |
| 240 |
235 if (j_referrer_url) { | 241 if (j_referrer_url) { |
236 params.referrer = content::Referrer( | 242 params.referrer = content::Referrer( |
237 GURL(ConvertJavaStringToUTF8(env, j_referrer_url)), | 243 GURL(ConvertJavaStringToUTF8(env, j_referrer_url)), |
238 static_cast<blink::WebReferrerPolicy>(referrer_policy)); | 244 static_cast<blink::WebReferrerPolicy>(referrer_policy)); |
239 } | 245 } |
240 | 246 |
241 navigation_controller_->LoadURLWithParams(params); | 247 navigation_controller_->LoadURLWithParams(params); |
242 } | 248 } |
243 | 249 |
244 void NavigationControllerAndroid::ClearHistory( | 250 void NavigationControllerAndroid::ClearHistory( |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
399 const JavaParamRef<jobject>& obj, | 405 const JavaParamRef<jobject>& obj, |
400 jlong source_navigation_controller_android, | 406 jlong source_navigation_controller_android, |
401 jboolean replace_entry) { | 407 jboolean replace_entry) { |
402 navigation_controller_->CopyStateFromAndPrune( | 408 navigation_controller_->CopyStateFromAndPrune( |
403 reinterpret_cast<NavigationControllerAndroid*>( | 409 reinterpret_cast<NavigationControllerAndroid*>( |
404 source_navigation_controller_android)->navigation_controller_, | 410 source_navigation_controller_android)->navigation_controller_, |
405 replace_entry); | 411 replace_entry); |
406 } | 412 } |
407 | 413 |
408 } // namespace content | 414 } // namespace content |
OLD | NEW |