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 "android_webview/native/aw_contents.h" | 5 #include "android_webview/native/aw_contents.h" |
6 | 6 |
7 #include "android_webview/browser/aw_browser_main_parts.h" | 7 #include "android_webview/browser/aw_browser_main_parts.h" |
8 #include "android_webview/browser/net_disk_cache_remover.h" | 8 #include "android_webview/browser/net_disk_cache_remover.h" |
9 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h" | 9 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h" |
10 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_dele
gate.h" | 10 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_dele
gate.h" |
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
538 MessageLoop::current()->DeleteSoon(FROM_HERE, pending.release()); | 538 MessageLoop::current()->DeleteSoon(FROM_HERE, pending.release()); |
539 return; | 539 return; |
540 } | 540 } |
541 pending_contents_ = pending.Pass(); | 541 pending_contents_ = pending.Pass(); |
542 } | 542 } |
543 | 543 |
544 jint AwContents::ReleasePopupWebContents(JNIEnv* env, jobject obj) { | 544 jint AwContents::ReleasePopupWebContents(JNIEnv* env, jobject obj) { |
545 return reinterpret_cast<jint>(pending_contents_.release()); | 545 return reinterpret_cast<jint>(pending_contents_.release()); |
546 } | 546 } |
547 | 547 |
| 548 ScopedJavaLocalRef<jobject> AwContents::CreateAwWebContentsViewDelegate( |
| 549 AwWebContentsViewDelegate* view_delegate) { |
| 550 JNIEnv* env = AttachCurrentThread(); |
| 551 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); |
| 552 if (obj.is_null()) |
| 553 return ScopedJavaLocalRef<jobject>(); |
| 554 |
| 555 return Java_AwContents_createAwWebContentsViewDelegate( |
| 556 env, |
| 557 obj.obj(), |
| 558 reinterpret_cast<jint>(view_delegate)); |
| 559 } |
| 560 |
548 } // namespace android_webview | 561 } // namespace android_webview |
OLD | NEW |