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

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

Issue 1308363003: Revert of jni_generator: Make all object-returning natives return ScopedJavaLocalRef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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 7b62d8bd2194d4e546cb11a62934faf2cad2975d..bf08bc53ee02d419c984a9e8e1f18d6fb65f999b 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 @@
}
// static
-ScopedJavaLocalRef<jobject> GetCurrentModalDialog(JNIEnv* env, jclass clazz) {
+jobject GetCurrentModalDialog(JNIEnv* env, jclass clazz) {
app_modal::AppModalDialog* dialog =
app_modal::AppModalDialogQueue::GetInstance()->active_dialog();
if (!dialog || !dialog->native_dialog())
- return ScopedJavaLocalRef<jobject>();
+ return NULL;
JavascriptAppModalDialogAndroid* js_dialog =
static_cast<JavascriptAppModalDialogAndroid*>(dialog->native_dialog());
- return ScopedJavaLocalRef<jobject>(js_dialog->GetDialogObject());
+ return js_dialog->GetDialogObject().obj();
}
// static
« no previous file with comments | « chrome/browser/ui/android/connection_info_popup_android.cc ('k') | chrome/browser/ui/android/navigation_popup.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698