OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/permission/aw_permission_request.h" | 5 #include "android_webview/native/permission/aw_permission_request.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "android_webview/native/permission/aw_permission_request_delegate.h" | 9 #include "android_webview/native/permission/aw_permission_request_delegate.h" |
10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
11 #include "jni/AwPermissionRequest_jni.h" | 11 #include "jni/AwPermissionRequest_jni.h" |
12 | 12 |
13 using base::android::AttachCurrentThread; | 13 using base::android::AttachCurrentThread; |
14 using base::android::ConvertUTF8ToJavaString; | 14 using base::android::ConvertUTF8ToJavaString; |
15 using base::android::ScopedJavaLocalRef; | 15 using base::android::ScopedJavaLocalRef; |
16 | 16 |
17 namespace android_webview { | 17 namespace android_webview { |
18 | 18 |
19 // static | 19 // static |
20 base::android::ScopedJavaLocalRef<jobject> AwPermissionRequest::Create( | 20 base::android::ScopedJavaLocalRef<jobject> AwPermissionRequest::Create( |
21 scoped_ptr<AwPermissionRequestDelegate> delegate, | 21 std::unique_ptr<AwPermissionRequestDelegate> delegate, |
22 base::WeakPtr<AwPermissionRequest>* weak_ptr) { | 22 base::WeakPtr<AwPermissionRequest>* weak_ptr) { |
23 base::android::ScopedJavaLocalRef<jobject> java_peer; | 23 base::android::ScopedJavaLocalRef<jobject> java_peer; |
24 AwPermissionRequest* permission_request = | 24 AwPermissionRequest* permission_request = |
25 new AwPermissionRequest(std::move(delegate), &java_peer); | 25 new AwPermissionRequest(std::move(delegate), &java_peer); |
26 *weak_ptr = permission_request->weak_factory_.GetWeakPtr(); | 26 *weak_ptr = permission_request->weak_factory_.GetWeakPtr(); |
27 return java_peer; | 27 return java_peer; |
28 } | 28 } |
29 | 29 |
30 AwPermissionRequest::AwPermissionRequest( | 30 AwPermissionRequest::AwPermissionRequest( |
31 scoped_ptr<AwPermissionRequestDelegate> delegate, | 31 std::unique_ptr<AwPermissionRequestDelegate> delegate, |
32 ScopedJavaLocalRef<jobject>* java_peer) | 32 ScopedJavaLocalRef<jobject>* java_peer) |
33 : delegate_(std::move(delegate)), processed_(false), weak_factory_(this) { | 33 : delegate_(std::move(delegate)), processed_(false), weak_factory_(this) { |
34 DCHECK(delegate_.get()); | 34 DCHECK(delegate_.get()); |
35 DCHECK(java_peer); | 35 DCHECK(java_peer); |
36 | 36 |
37 JNIEnv* env = AttachCurrentThread(); | 37 JNIEnv* env = AttachCurrentThread(); |
38 *java_peer = Java_AwPermissionRequest_create( | 38 *java_peer = Java_AwPermissionRequest_create( |
39 env, reinterpret_cast<jlong>(this), | 39 env, reinterpret_cast<jlong>(this), |
40 ConvertUTF8ToJavaString(env, GetOrigin().spec()).obj(), GetResources()); | 40 ConvertUTF8ToJavaString(env, GetOrigin().spec()).obj(), GetResources()); |
41 java_ref_ = JavaObjectWeakGlobalRef(env, java_peer->obj()); | 41 java_ref_ = JavaObjectWeakGlobalRef(env, java_peer->obj()); |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 void AwPermissionRequest::CancelAndDelete() { | 86 void AwPermissionRequest::CancelAndDelete() { |
87 processed_ = true; | 87 processed_ = true; |
88 DeleteThis(); | 88 DeleteThis(); |
89 } | 89 } |
90 | 90 |
91 bool RegisterAwPermissionRequest(JNIEnv* env) { | 91 bool RegisterAwPermissionRequest(JNIEnv* env) { |
92 return RegisterNativesImpl(env); | 92 return RegisterNativesImpl(env); |
93 } | 93 } |
94 | 94 |
95 } // namespace android_webivew | 95 } // namespace android_webivew |
OLD | NEW |