| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/web_contents_delegate_android/web_contents_delegate_android
.h" | 5 #include "components/web_contents_delegate_android/web_contents_delegate_android
.h" |
| 6 | 6 |
| 7 #include <android/keycodes.h> | 7 #include <android/keycodes.h> |
| 8 | 8 |
| 9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 10 #include "base/android/jni_array.h" | 10 #include "base/android/jni_array.h" |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 // content::OpenURLParams -> content::NavigationController::LoadURLParams | 113 // content::OpenURLParams -> content::NavigationController::LoadURLParams |
| 114 content::NavigationController::LoadURLParams load_params(url); | 114 content::NavigationController::LoadURLParams load_params(url); |
| 115 load_params.referrer = params.referrer; | 115 load_params.referrer = params.referrer; |
| 116 load_params.frame_tree_node_id = params.frame_tree_node_id; | 116 load_params.frame_tree_node_id = params.frame_tree_node_id; |
| 117 load_params.redirect_chain = params.redirect_chain; | 117 load_params.redirect_chain = params.redirect_chain; |
| 118 load_params.transition_type = params.transition; | 118 load_params.transition_type = params.transition; |
| 119 load_params.extra_headers = params.extra_headers; | 119 load_params.extra_headers = params.extra_headers; |
| 120 load_params.should_replace_current_entry = | 120 load_params.should_replace_current_entry = |
| 121 params.should_replace_current_entry; | 121 params.should_replace_current_entry; |
| 122 load_params.is_renderer_initiated = params.is_renderer_initiated; | 122 load_params.is_renderer_initiated = params.is_renderer_initiated; |
| 123 load_params.is_transition_navigation = params.is_transition_navigation; |
| 123 | 124 |
| 124 if (params.transferred_global_request_id != content::GlobalRequestID()) { | 125 if (params.transferred_global_request_id != content::GlobalRequestID()) { |
| 125 load_params.transferred_global_request_id = | 126 load_params.transferred_global_request_id = |
| 126 params.transferred_global_request_id; | 127 params.transferred_global_request_id; |
| 127 } | 128 } |
| 128 | 129 |
| 129 // Only allows the browser-initiated navigation to use POST. | 130 // Only allows the browser-initiated navigation to use POST. |
| 130 if (params.uses_post && !params.is_renderer_initiated) { | 131 if (params.uses_post && !params.is_renderer_initiated) { |
| 131 load_params.load_type = | 132 load_params.load_type = |
| 132 content::NavigationController::LOAD_TYPE_BROWSER_INITIATED_HTTP_POST; | 133 content::NavigationController::LOAD_TYPE_BROWSER_INITIATED_HTTP_POST; |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 384 // Native JNI methods | 385 // Native JNI methods |
| 385 // ---------------------------------------------------------------------------- | 386 // ---------------------------------------------------------------------------- |
| 386 | 387 |
| 387 // Register native methods | 388 // Register native methods |
| 388 | 389 |
| 389 bool RegisterWebContentsDelegateAndroid(JNIEnv* env) { | 390 bool RegisterWebContentsDelegateAndroid(JNIEnv* env) { |
| 390 return RegisterNativesImpl(env); | 391 return RegisterNativesImpl(env); |
| 391 } | 392 } |
| 392 | 393 |
| 393 } // namespace web_contents_delegate_android | 394 } // namespace web_contents_delegate_android |
| OLD | NEW |