Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Side by Side Diff: android_webview/native/permission/aw_permission_request.cc

Issue 2237943002: Remove now-unnecessary .obj() in Java method calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch-context
Patch Set: Rebase *again* :( Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
(...skipping 20 matching lines...) Expand all
31 AwPermissionRequest::AwPermissionRequest( 31 AwPermissionRequest::AwPermissionRequest(
32 std::unique_ptr<AwPermissionRequestDelegate> delegate, 32 std::unique_ptr<AwPermissionRequestDelegate> delegate,
33 ScopedJavaLocalRef<jobject>* java_peer) 33 ScopedJavaLocalRef<jobject>* java_peer)
34 : delegate_(std::move(delegate)), processed_(false), weak_factory_(this) { 34 : delegate_(std::move(delegate)), processed_(false), weak_factory_(this) {
35 DCHECK(delegate_.get()); 35 DCHECK(delegate_.get());
36 DCHECK(java_peer); 36 DCHECK(java_peer);
37 37
38 JNIEnv* env = AttachCurrentThread(); 38 JNIEnv* env = AttachCurrentThread();
39 *java_peer = Java_AwPermissionRequest_create( 39 *java_peer = Java_AwPermissionRequest_create(
40 env, reinterpret_cast<jlong>(this), 40 env, reinterpret_cast<jlong>(this),
41 ConvertUTF8ToJavaString(env, GetOrigin().spec()).obj(), GetResources()); 41 ConvertUTF8ToJavaString(env, GetOrigin().spec()), GetResources());
42 java_ref_ = JavaObjectWeakGlobalRef(env, java_peer->obj()); 42 java_ref_ = JavaObjectWeakGlobalRef(env, java_peer->obj());
43 } 43 }
44 44
45 AwPermissionRequest::~AwPermissionRequest() { 45 AwPermissionRequest::~AwPermissionRequest() {
46 OnAcceptInternal(false); 46 OnAcceptInternal(false);
47 } 47 }
48 48
49 void AwPermissionRequest::OnAccept(JNIEnv* env, 49 void AwPermissionRequest::OnAccept(JNIEnv* env,
50 const JavaParamRef<jobject>& jcaller, 50 const JavaParamRef<jobject>& jcaller,
51 jboolean accept) { 51 jboolean accept) {
52 OnAcceptInternal(accept); 52 OnAcceptInternal(accept);
53 } 53 }
54 54
55 void AwPermissionRequest::OnAcceptInternal(bool accept) { 55 void AwPermissionRequest::OnAcceptInternal(bool accept) {
56 if (!processed_) { 56 if (!processed_) {
57 delegate_->NotifyRequestResult(accept); 57 delegate_->NotifyRequestResult(accept);
58 processed_ = true; 58 processed_ = true;
59 } 59 }
60 } 60 }
61 61
62 void AwPermissionRequest::DeleteThis() { 62 void AwPermissionRequest::DeleteThis() {
63 ScopedJavaLocalRef<jobject> j_request = GetJavaObject(); 63 ScopedJavaLocalRef<jobject> j_request = GetJavaObject();
64 if (j_request.is_null()) 64 if (j_request.is_null())
65 return; 65 return;
66 Java_AwPermissionRequest_destroyNative(AttachCurrentThread(), 66 Java_AwPermissionRequest_destroyNative(AttachCurrentThread(), j_request);
67 j_request.obj());
68 } 67 }
69 68
70 void AwPermissionRequest::Destroy(JNIEnv* env, 69 void AwPermissionRequest::Destroy(JNIEnv* env,
71 const JavaParamRef<jobject>& obj) { 70 const JavaParamRef<jobject>& obj) {
72 delete this; 71 delete this;
73 } 72 }
74 73
75 ScopedJavaLocalRef<jobject> AwPermissionRequest::GetJavaObject() { 74 ScopedJavaLocalRef<jobject> AwPermissionRequest::GetJavaObject() {
76 return java_ref_.get(AttachCurrentThread()); 75 return java_ref_.get(AttachCurrentThread());
77 } 76 }
78 77
79 const GURL& AwPermissionRequest::GetOrigin() { 78 const GURL& AwPermissionRequest::GetOrigin() {
80 return delegate_->GetOrigin(); 79 return delegate_->GetOrigin();
81 } 80 }
82 81
83 int64_t AwPermissionRequest::GetResources() { 82 int64_t AwPermissionRequest::GetResources() {
84 return delegate_->GetResources(); 83 return delegate_->GetResources();
85 } 84 }
86 85
87 void AwPermissionRequest::CancelAndDelete() { 86 void AwPermissionRequest::CancelAndDelete() {
88 processed_ = true; 87 processed_ = true;
89 DeleteThis(); 88 DeleteThis();
90 } 89 }
91 90
92 bool RegisterAwPermissionRequest(JNIEnv* env) { 91 bool RegisterAwPermissionRequest(JNIEnv* env) {
93 return RegisterNativesImpl(env); 92 return RegisterNativesImpl(env);
94 } 93 }
95 94
96 } // namespace android_webivew 95 } // namespace android_webivew
OLDNEW
« no previous file with comments | « android_webview/native/java_browser_view_renderer_helper.cc ('k') | android_webview/native/token_binding_manager_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698