| 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 "chrome/browser/android/chrome_web_contents_delegate_android.h" | 5 #include "chrome/browser/android/chrome_web_contents_delegate_android.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 bool* was_blocked) { | 313 bool* was_blocked) { |
| 314 // No code for this yet. | 314 // No code for this yet. |
| 315 DCHECK_NE(disposition, SAVE_TO_DISK); | 315 DCHECK_NE(disposition, SAVE_TO_DISK); |
| 316 // Can't create a new contents for the current tab - invalid case. | 316 // Can't create a new contents for the current tab - invalid case. |
| 317 DCHECK_NE(disposition, CURRENT_TAB); | 317 DCHECK_NE(disposition, CURRENT_TAB); |
| 318 | 318 |
| 319 TabHelpers::AttachTabHelpers(new_contents); | 319 TabHelpers::AttachTabHelpers(new_contents); |
| 320 | 320 |
| 321 JNIEnv* env = AttachCurrentThread(); | 321 JNIEnv* env = AttachCurrentThread(); |
| 322 ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env); | 322 ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env); |
| 323 AddWebContentsResult add_result = | 323 bool handled = false; |
| 324 ADD_WEB_CONTENTS_RESULT_STOP_LOAD_AND_DELETE; | |
| 325 if (!obj.is_null()) { | 324 if (!obj.is_null()) { |
| 326 ScopedJavaLocalRef<jobject> jsource; | 325 ScopedJavaLocalRef<jobject> jsource; |
| 327 if (source) | 326 if (source) |
| 328 jsource = source->GetJavaWebContents(); | 327 jsource = source->GetJavaWebContents(); |
| 329 ScopedJavaLocalRef<jobject> jnew_contents; | 328 ScopedJavaLocalRef<jobject> jnew_contents; |
| 330 if (new_contents) | 329 if (new_contents) |
| 331 jnew_contents = new_contents->GetJavaWebContents(); | 330 jnew_contents = new_contents->GetJavaWebContents(); |
| 332 | 331 |
| 333 add_result = static_cast<AddWebContentsResult>( | 332 handled = Java_ChromeWebContentsDelegateAndroid_addNewContents( |
| 334 Java_ChromeWebContentsDelegateAndroid_addNewContents( | 333 env, |
| 335 env, | 334 obj.obj(), |
| 336 obj.obj(), | 335 jsource.obj(), |
| 337 jsource.obj(), | 336 jnew_contents.obj(), |
| 338 jnew_contents.obj(), | 337 static_cast<jint>(disposition), |
| 339 static_cast<jint>(disposition), | 338 NULL, |
| 340 NULL, | 339 user_gesture); |
| 341 user_gesture)); | |
| 342 } | 340 } |
| 343 | 341 |
| 344 if (was_blocked) | 342 if (was_blocked) |
| 345 *was_blocked = !(add_result == ADD_WEB_CONTENTS_RESULT_PROCEED); | 343 *was_blocked = !handled; |
| 346 | 344 if (!handled) |
| 347 if (add_result == ADD_WEB_CONTENTS_RESULT_STOP_LOAD_AND_DELETE) | |
| 348 delete new_contents; | 345 delete new_contents; |
| 349 } | 346 } |
| 350 | 347 |
| 351 } // namespace android | 348 } // namespace android |
| 352 } // namespace chrome | 349 } // namespace chrome |
| OLD | NEW |