components/web_contents_delegate_android/web_contents_delegate_android.cc - Issue 2237943002: Remove now-unnecessary .obj() in Java method calls.

Unified Diff: components/web_contents_delegate_android/web_contents_delegate_android.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 | « components/web_contents_delegate_android/validation_message_bubble_android.cc ('k') | components/web_restrictions/browser/web_restrictions_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/web_contents_delegate_android/web_contents_delegate_android.cc

diff --git a/components/web_contents_delegate_android/web_contents_delegate_android.cc b/components/web_contents_delegate_android/web_contents_delegate_android.cc

index 0f5d7db379b889ad56f86b33ef8a23a5b569364a..61710e69475574f18c63175a494e75b33e7caab8 100644

--- a/components/web_contents_delegate_android/web_contents_delegate_android.cc

+++ b/components/web_contents_delegate_android/web_contents_delegate_android.cc

@@ -93,13 +93,9 @@ WebContents* WebContentsDelegateAndroid::OpenURLFromTab(

ScopedJavaLocalRef<jobject> post_data;

if (params.uses_post && params.post_data)

post_data = params.post_data->ToJavaObject(env);

- Java_WebContentsDelegateAndroid_openNewTab(env,

- obj.obj(),

- java_url.obj(),

- extra_headers.obj(),

- post_data.obj(),

- disposition,

- params.is_renderer_initiated);

+ Java_WebContentsDelegateAndroid_openNewTab(

+ env, obj, java_url, extra_headers, post_data, disposition,

+ params.is_renderer_initiated);

return NULL;

}

@@ -130,10 +126,8 @@ void WebContentsDelegateAndroid::NavigationStateChanged(

ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);

if (obj.is_null())

return;

- Java_WebContentsDelegateAndroid_navigationStateChanged(

- env,

- obj.obj(),

- changed_flags);

+ Java_WebContentsDelegateAndroid_navigationStateChanged(env, obj,

+ changed_flags);

}

void WebContentsDelegateAndroid::VisibleSSLStateChanged(

@@ -142,9 +136,7 @@ void WebContentsDelegateAndroid::VisibleSSLStateChanged(

ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);

if (obj.is_null())

return;

- Java_WebContentsDelegateAndroid_visibleSSLStateChanged(

- env,

- obj.obj());

+ Java_WebContentsDelegateAndroid_visibleSSLStateChanged(env, obj);

}

void WebContentsDelegateAndroid::ActivateContents(WebContents* contents) {

@@ -152,15 +144,14 @@ void WebContentsDelegateAndroid::ActivateContents(WebContents* contents) {

ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);

if (obj.is_null())

return;

- Java_WebContentsDelegateAndroid_activateContents(env, obj.obj());

+ Java_WebContentsDelegateAndroid_activateContents(env, obj);

}

void WebContentsDelegateAndroid::LoadingStateChanged(WebContents* source,

bool to_different_document) {

JNIEnv* env = AttachCurrentThread();

ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);

- Java_WebContentsDelegateAndroid_loadingStateChanged(env,

- obj.obj(),

+ Java_WebContentsDelegateAndroid_loadingStateChanged(env, obj,

to_different_document);

}

@@ -170,10 +161,7 @@ void WebContentsDelegateAndroid::LoadProgressChanged(WebContents* source,

ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);

if (obj.is_null())

return;

- Java_WebContentsDelegateAndroid_notifyLoadProgressChanged(

- env,

- obj.obj(),

- progress);

+ Java_WebContentsDelegateAndroid_notifyLoadProgressChanged(env, obj, progress);

}

void WebContentsDelegateAndroid::RendererUnresponsive(WebContents* source) {

@@ -181,7 +169,7 @@ void WebContentsDelegateAndroid::RendererUnresponsive(WebContents* source) {

ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);

if (obj.is_null())

return;

- Java_WebContentsDelegateAndroid_rendererUnresponsive(env, obj.obj());

+ Java_WebContentsDelegateAndroid_rendererUnresponsive(env, obj);

}

void WebContentsDelegateAndroid::RendererResponsive(WebContents* source) {

@@ -189,7 +177,7 @@ void WebContentsDelegateAndroid::RendererResponsive(WebContents* source) {

ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);

if (obj.is_null())

return;

- Java_WebContentsDelegateAndroid_rendererResponsive(env, obj.obj());

+ Java_WebContentsDelegateAndroid_rendererResponsive(env, obj);

}

bool WebContentsDelegateAndroid::ShouldCreateWebContents(

@@ -208,8 +196,8 @@ bool WebContentsDelegateAndroid::ShouldCreateWebContents(

return true;

ScopedJavaLocalRef<jstring> java_url =

ConvertUTF8ToJavaString(env, target_url.spec());

- return Java_WebContentsDelegateAndroid_shouldCreateWebContents(env, obj.obj(),

- java_url.obj());

+ return Java_WebContentsDelegateAndroid_shouldCreateWebContents(env, obj,

+ java_url);

}

bool WebContentsDelegateAndroid::OnGoToEntryOffset(int offset) {

@@ -217,8 +205,7 @@ bool WebContentsDelegateAndroid::OnGoToEntryOffset(int offset) {

ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);

if (obj.is_null())

return true;

- return Java_WebContentsDelegateAndroid_onGoToEntryOffset(env, obj.obj(),

- offset);

+ return Java_WebContentsDelegateAndroid_onGoToEntryOffset(env, obj, offset);

}

void WebContentsDelegateAndroid::WebContentsCreated(

@@ -238,10 +225,10 @@ void WebContentsDelegateAndroid::WebContentsCreated(

jnew_contents = new_contents->GetJavaWebContents();

Java_WebContentsDelegateAndroid_webContentsCreated(

- env, obj.obj(), jsource_contents.obj(), opener_render_frame_id,

- base::android::ConvertUTF8ToJavaString(env, frame_name).obj(),

- base::android::ConvertUTF8ToJavaString(env, target_url.spec()).obj(),

- jnew_contents.obj());

+ env, obj, jsource_contents, opener_render_frame_id,

+ base::android::ConvertUTF8ToJavaString(env, frame_name),

+ base::android::ConvertUTF8ToJavaString(env, target_url.spec()),

+ jnew_contents);

}

void WebContentsDelegateAndroid::CloseContents(WebContents* source) {

@@ -249,7 +236,7 @@ void WebContentsDelegateAndroid::CloseContents(WebContents* source) {

ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);

if (obj.is_null())

return;

- Java_WebContentsDelegateAndroid_closeContents(env, obj.obj());

+ Java_WebContentsDelegateAndroid_closeContents(env, obj);

}

void WebContentsDelegateAndroid::MoveContents(WebContents* source,

@@ -289,12 +276,7 @@ bool WebContentsDelegateAndroid::AddMessageToConsole(

NOTREACHED();

}

return Java_WebContentsDelegateAndroid_addMessageToConsole(

- env,

- GetJavaDelegate(env).obj(),

- jlevel,

- jmessage.obj(),

- line_no,

- jsource_id.obj());

+ env, GetJavaDelegate(env), jlevel, jmessage, line_no, jsource_id);

}

// This is either called from TabContents::DidNavigateMainFramePostCommit() with

@@ -312,9 +294,7 @@ void WebContentsDelegateAndroid::UpdateTargetURL(WebContents* source,

return;

ScopedJavaLocalRef<jstring> java_url =

ConvertUTF8ToJavaString(env, source->GetURL().spec());

- Java_WebContentsDelegateAndroid_onUpdateUrl(env,

- obj.obj(),

- java_url.obj());

+ Java_WebContentsDelegateAndroid_onUpdateUrl(env, obj, java_url);

}

void WebContentsDelegateAndroid::HandleKeyboardEvent(

@@ -326,8 +306,7 @@ void WebContentsDelegateAndroid::HandleKeyboardEvent(

ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);

if (obj.is_null())

return;

- Java_WebContentsDelegateAndroid_handleKeyboardEvent(

- env, obj.obj(), key_event);

+ Java_WebContentsDelegateAndroid_handleKeyboardEvent(env, obj, key_event);

}

@@ -336,8 +315,7 @@ bool WebContentsDelegateAndroid::TakeFocus(WebContents* source, bool reverse) {

ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);

if (obj.is_null())

return WebContentsDelegate::TakeFocus(source, reverse);

- return Java_WebContentsDelegateAndroid_takeFocus(

- env, obj.obj(), reverse);

+ return Java_WebContentsDelegateAndroid_takeFocus(env, obj, reverse);

}

void WebContentsDelegateAndroid::ShowRepostFormWarningDialog(

@@ -346,7 +324,7 @@ void WebContentsDelegateAndroid::ShowRepostFormWarningDialog(

ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);

if (obj.is_null())

return;

- Java_WebContentsDelegateAndroid_showRepostFormWarningDialog(env, obj.obj());

+ Java_WebContentsDelegateAndroid_showRepostFormWarningDialog(env, obj);

}

void WebContentsDelegateAndroid::EnterFullscreenModeForTab(

@@ -356,8 +334,7 @@ void WebContentsDelegateAndroid::EnterFullscreenModeForTab(

ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);

if (obj.is_null())

return;

- Java_WebContentsDelegateAndroid_toggleFullscreenModeForTab(env, obj.obj(),

- true);

+ Java_WebContentsDelegateAndroid_toggleFullscreenModeForTab(env, obj, true);

}

void WebContentsDelegateAndroid::ExitFullscreenModeForTab(

@@ -366,8 +343,7 @@ void WebContentsDelegateAndroid::ExitFullscreenModeForTab(

ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);

if (obj.is_null())

return;

- Java_WebContentsDelegateAndroid_toggleFullscreenModeForTab(env, obj.obj(),

- false);

+ Java_WebContentsDelegateAndroid_toggleFullscreenModeForTab(env, obj, false);

}

bool WebContentsDelegateAndroid::IsFullscreenForTabOrPending(

@@ -376,8 +352,7 @@ bool WebContentsDelegateAndroid::IsFullscreenForTabOrPending(

ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);

if (obj.is_null())

return false;

- return Java_WebContentsDelegateAndroid_isFullscreenForTabOrPending(

- env, obj.obj());

+ return Java_WebContentsDelegateAndroid_isFullscreenForTabOrPending(env, obj);

}

void WebContentsDelegateAndroid::ShowValidationMessage(