OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "chrome/browser/android/tab_android.h" | 5 #include "chrome/browser/android/tab_android.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 } | 207 } |
208 | 208 |
209 void TabAndroid::HandlePopupNavigation(chrome::NavigateParams* params) { | 209 void TabAndroid::HandlePopupNavigation(chrome::NavigateParams* params) { |
210 DCHECK(params->source_contents == web_contents()); | 210 DCHECK(params->source_contents == web_contents()); |
211 DCHECK(params->target_contents == NULL || | 211 DCHECK(params->target_contents == NULL || |
212 params->target_contents == web_contents()); | 212 params->target_contents == web_contents()); |
213 | 213 |
214 WindowOpenDisposition disposition = params->disposition; | 214 WindowOpenDisposition disposition = params->disposition; |
215 const GURL& url = params->url; | 215 const GURL& url = params->url; |
216 | 216 |
217 if (disposition == NEW_POPUP || | 217 if (disposition == WindowOpenDisposition::NEW_POPUP || |
218 disposition == NEW_FOREGROUND_TAB || | 218 disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB || |
219 disposition == NEW_BACKGROUND_TAB || | 219 disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB || |
220 disposition == NEW_WINDOW || | 220 disposition == WindowOpenDisposition::NEW_WINDOW || |
221 disposition == OFF_THE_RECORD) { | 221 disposition == WindowOpenDisposition::OFF_THE_RECORD) { |
222 JNIEnv* env = AttachCurrentThread(); | 222 JNIEnv* env = AttachCurrentThread(); |
223 ScopedJavaLocalRef<jobject> jobj = weak_java_tab_.get(env); | 223 ScopedJavaLocalRef<jobject> jobj = weak_java_tab_.get(env); |
224 ScopedJavaLocalRef<jstring> jurl(ConvertUTF8ToJavaString(env, url.spec())); | 224 ScopedJavaLocalRef<jstring> jurl(ConvertUTF8ToJavaString(env, url.spec())); |
225 ScopedJavaLocalRef<jstring> jheaders( | 225 ScopedJavaLocalRef<jstring> jheaders( |
226 ConvertUTF8ToJavaString(env, params->extra_headers)); | 226 ConvertUTF8ToJavaString(env, params->extra_headers)); |
227 ScopedJavaLocalRef<jobject> jpost_data; | 227 ScopedJavaLocalRef<jobject> jpost_data; |
228 if (params->uses_post && params->post_data) | 228 if (params->uses_post && params->post_data) |
229 jpost_data = params->post_data->ToJavaObject(env); | 229 jpost_data = params->post_data->ToJavaObject(env); |
230 Java_Tab_openNewTab(env, jobj, jurl, jheaders, jpost_data, disposition, | 230 Java_Tab_openNewTab( |
231 params->created_with_opener, | 231 env, jobj, jurl, jheaders, jpost_data, static_cast<int>(disposition), |
232 params->is_renderer_initiated); | 232 params->created_with_opener, params->is_renderer_initiated); |
233 } else { | 233 } else { |
234 NOTIMPLEMENTED(); | 234 NOTIMPLEMENTED(); |
235 } | 235 } |
236 } | 236 } |
237 | 237 |
238 bool TabAndroid::HasPrerenderedUrl(GURL gurl) { | 238 bool TabAndroid::HasPrerenderedUrl(GURL gurl) { |
239 prerender::PrerenderManager* prerender_manager = GetPrerenderManager(); | 239 prerender::PrerenderManager* prerender_manager = GetPrerenderManager(); |
240 if (!prerender_manager) | 240 if (!prerender_manager) |
241 return false; | 241 return false; |
242 | 242 |
(...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
911 static void Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 911 static void Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
912 TRACE_EVENT0("native", "TabAndroid::Init"); | 912 TRACE_EVENT0("native", "TabAndroid::Init"); |
913 // This will automatically bind to the Java object and pass ownership there. | 913 // This will automatically bind to the Java object and pass ownership there. |
914 new TabAndroid(env, obj); | 914 new TabAndroid(env, obj); |
915 } | 915 } |
916 | 916 |
917 // static | 917 // static |
918 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) { | 918 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) { |
919 return RegisterNativesImpl(env); | 919 return RegisterNativesImpl(env); |
920 } | 920 } |
OLD | NEW |