| 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
|
|
|