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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
160 jstring base_url_for_data_url, | 160 jstring base_url_for_data_url, |
161 jstring virtual_url_for_data_url, | 161 jstring virtual_url_for_data_url, |
162 jboolean can_load_local_resources, | 162 jboolean can_load_local_resources, |
163 jboolean is_renderer_initiated) { | 163 jboolean is_renderer_initiated) { |
164 DCHECK(url); | 164 DCHECK(url); |
165 NavigationController::LoadURLParams params( | 165 NavigationController::LoadURLParams params( |
166 GURL(ConvertJavaStringToUTF8(env, url))); | 166 GURL(ConvertJavaStringToUTF8(env, url))); |
167 | 167 |
168 params.load_type = | 168 params.load_type = |
169 static_cast<NavigationController::LoadURLType>(load_url_type); | 169 static_cast<NavigationController::LoadURLType>(load_url_type); |
170 params.transition_type = PageTransitionFromInt(transition_type); | 170 params.transition_type = ui::PageTransitionFromInt(transition_type); |
171 params.override_user_agent = | 171 params.override_user_agent = |
172 static_cast<NavigationController::UserAgentOverrideOption>( | 172 static_cast<NavigationController::UserAgentOverrideOption>( |
173 ua_override_option); | 173 ua_override_option); |
174 params.can_load_local_resources = can_load_local_resources; | 174 params.can_load_local_resources = can_load_local_resources; |
175 params.is_renderer_initiated = is_renderer_initiated; | 175 params.is_renderer_initiated = is_renderer_initiated; |
176 | 176 |
177 if (extra_headers) | 177 if (extra_headers) |
178 params.extra_headers = ConvertJavaStringToUTF8(env, extra_headers); | 178 params.extra_headers = ConvertJavaStringToUTF8(env, extra_headers); |
179 | 179 |
180 if (post_data) { | 180 if (post_data) { |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
286 | 286 |
287 // Send the override to the renderer. | 287 // Send the override to the renderer. |
288 if (reload_on_state_change) { | 288 if (reload_on_state_change) { |
289 // Reloading the page will send the override down as part of the | 289 // Reloading the page will send the override down as part of the |
290 // navigation IPC message. | 290 // navigation IPC message. |
291 navigation_controller_->ReloadOriginalRequestURL(false); | 291 navigation_controller_->ReloadOriginalRequestURL(false); |
292 } | 292 } |
293 } | 293 } |
294 | 294 |
295 } // namespace content | 295 } // namespace content |
OLD | NEW |