chrome/browser/ui/android/javascript_app_modal_dialog_android.cc - Issue 1288183004: jni_generator: Make all object-returning natives return ScopedJavaLocalRef.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/android/javascript_app_modal_dialog_android.cc

Issue 1288183004: jni_generator: Make all object-returning natives return ScopedJavaLocalRef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add some newlines for readability Created 5 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

« chrome/browser/signin/oauth2_token_service_delegate_android.h ('K') | « chrome/browser/ui/android/connection_info_popup_android.cc ('k') | chrome/browser/ui/android/navigation_popup.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/android/javascript_app_modal_dialog_android.cc

diff --git a/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc b/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc

index bf08bc53ee02d419c984a9e8e1f18d6fb65f999b..7b62d8bd2194d4e546cb11a62934faf2cad2975d 100644

--- a/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc

+++ b/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc

@@ -136,15 +136,15 @@ const ScopedJavaGlobalRef<jobject>&

}

// static

-jobject GetCurrentModalDialog(JNIEnv* env, jclass clazz) {

+ScopedJavaLocalRef<jobject> GetCurrentModalDialog(JNIEnv* env, jclass clazz) {

app_modal::AppModalDialog* dialog =

app_modal::AppModalDialogQueue::GetInstance()->active_dialog();

if (!dialog || !dialog->native_dialog())

- return NULL;

+ return ScopedJavaLocalRef<jobject>();

JavascriptAppModalDialogAndroid* js_dialog =

static_cast<JavascriptAppModalDialogAndroid*>(dialog->native_dialog());

- return js_dialog->GetDialogObject().obj();

+ return ScopedJavaLocalRef<jobject>(js_dialog->GetDialogObject());

}

// static