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

Unified Diff: android_webview/native/aw_contents_client_bridge.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/native/aw_contents.cc ('k') | android_webview/native/aw_contents_client_bridge_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/native/aw_contents_client_bridge.cc
diff --git a/android_webview/native/aw_contents_client_bridge.cc b/android_webview/native/aw_contents_client_bridge.cc
index 9b4e00ff1a8b906fe0eb86142a5ae826e10bac64..1a6e11b9143b8216cfd1255cfec38b260ead99fb 100644
--- a/android_webview/native/aw_contents_client_bridge.cc
+++ b/android_webview/native/aw_contents_client_bridge.cc
@@ -65,8 +65,7 @@ AwContentsClientBridge::~AwContentsClientBridge() {
if (!obj.is_null()) {
// Clear the weak reference from the java peer to the native object since
// it is possible that java object lifetime can exceed the AwContens.
- Java_AwContentsClientBridge_setNativeContentsClientBridge(env, obj.obj(),
- 0);
+ Java_AwContentsClientBridge_setNativeContentsClientBridge(env, obj, 0);
}
for (IDMap<content::ClientCertificateDelegate>::iterator iter(
@@ -101,7 +100,7 @@ void AwContentsClientBridge::AllowCertificateError(
int request_id = pending_cert_error_callbacks_.Add(
new CertErrorCallback(callback));
*cancel_request = !Java_AwContentsClientBridge_allowCertificateError(
- env, obj.obj(), cert_error, jcert.obj(), jurl.obj(), request_id);
+ env, obj, cert_error, jcert, jurl, request_id);
// if the request is cancelled, then cancel the stored callback
if (*cancel_request) {
pending_cert_error_callbacks_.Remove(request_id);
@@ -183,12 +182,7 @@ void AwContentsClientBridge::SelectClientCertificate(
env, cert_request_info->host_and_port.host());
Java_AwContentsClientBridge_selectClientCertificate(
- env,
- obj.obj(),
- request_id,
- key_types_ref.obj(),
- principals_ref.obj(),
- host_name_ref.obj(),
+ env, obj, request_id, key_types_ref, principals_ref, host_name_ref,
cert_request_info->host_and_port.port());
// Release the guard.
@@ -291,26 +285,22 @@ void AwContentsClientBridge::RunJavaScriptDialog(
switch (message_type) {
case content::JAVASCRIPT_MESSAGE_TYPE_ALERT: {
devtools_instrumentation::ScopedEmbedderCallbackTask("onJsAlert");
- Java_AwContentsClientBridge_handleJsAlert(
- env, obj.obj(), jurl.obj(), jmessage.obj(), callback_id);
+ Java_AwContentsClientBridge_handleJsAlert(env, obj, jurl, jmessage,
+ callback_id);
break;
}
case content::JAVASCRIPT_MESSAGE_TYPE_CONFIRM: {
devtools_instrumentation::ScopedEmbedderCallbackTask("onJsConfirm");
- Java_AwContentsClientBridge_handleJsConfirm(
- env, obj.obj(), jurl.obj(), jmessage.obj(), callback_id);
+ Java_AwContentsClientBridge_handleJsConfirm(env, obj, jurl, jmessage,
+ callback_id);
break;
}
case content::JAVASCRIPT_MESSAGE_TYPE_PROMPT: {
ScopedJavaLocalRef<jstring> jdefault_value(
ConvertUTF16ToJavaString(env, default_prompt_text));
devtools_instrumentation::ScopedEmbedderCallbackTask("onJsPrompt");
- Java_AwContentsClientBridge_handleJsPrompt(env,
- obj.obj(),
- jurl.obj(),
- jmessage.obj(),
- jdefault_value.obj(),
- callback_id);
+ Java_AwContentsClientBridge_handleJsPrompt(env, obj, jurl, jmessage,
+ jdefault_value, callback_id);
break;
}
default:
@@ -341,8 +331,8 @@ void AwContentsClientBridge::RunBeforeUnloadDialog(
ConvertUTF16ToJavaString(env, message_text));
devtools_instrumentation::ScopedEmbedderCallbackTask("onJsBeforeUnload");
- Java_AwContentsClientBridge_handleJsBeforeUnload(
- env, obj.obj(), jurl.obj(), jmessage.obj(), callback_id);
+ Java_AwContentsClientBridge_handleJsBeforeUnload(env, obj, jurl, jmessage,
+ callback_id);
}
bool AwContentsClientBridge::ShouldOverrideUrlLoading(const base::string16& url,
@@ -357,7 +347,7 @@ bool AwContentsClientBridge::ShouldOverrideUrlLoading(const base::string16& url,
devtools_instrumentation::ScopedEmbedderCallbackTask(
"shouldOverrideUrlLoading");
return Java_AwContentsClientBridge_shouldOverrideUrlLoading(
- env, obj.obj(), jurl.obj(), has_user_gesture, is_redirect, is_main_frame);
+ env, obj, jurl, has_user_gesture, is_redirect, is_main_frame);
}
void AwContentsClientBridge::ConfirmJsResult(JNIEnv* env,
« no previous file with comments | « android_webview/native/aw_contents.cc ('k') | android_webview/native/aw_contents_client_bridge_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698