Refactoring JavaScript modal dialog.

chrome/browser/ui/android/javascript_app_modal_dialog_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/utf_string_conversions.h"
 
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/javascript_message_type.h"
 #include "jni/JavascriptAppModalDialog_jni.h"
 #include "ui/gfx/android/window_android.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF16ToJavaString;
+using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 using content::BrowserThread;
 
 // static
 NativeAppModalDialog* NativeAppModalDialog::CreateNativeJavaScriptPrompt(
     JavaScriptAppModalDialog* dialog,
     gfx::NativeWindow parent_window) {
   return new JavascriptAppModalDialogAndroid(AttachCurrentThread(),
       dialog, parent_window);
 }
@@ skipping 19 matching lines @@
   NOTIMPLEMENTED();
   return 0;
 }
 
 void JavascriptAppModalDialogAndroid::ShowAppModalDialog() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   JNIEnv* env = AttachCurrentThread();
   // Keep a strong ref to the parent window while we make the call to java to
   // display the dialog.
-  ScopedJavaLocalRef<jobject> parent_jobj = parent_jobject_weak_ref_.get(
-      env);
+  ScopedJavaLocalRef<jobject> parent_jobj = parent_jobject_weak_ref_.get(env);
   if (parent_jobj.is_null()) {
     CancelAppModalDialog();
     return;
   }
 
   ScopedJavaLocalRef<jobject> dialog_object;
   ScopedJavaLocalRef<jstring> title =
       ConvertUTF16ToJavaString(env, dialog_->title());
   ScopedJavaLocalRef<jstring> message =
       ConvertUTF16ToJavaString(env, dialog_->message_text());
@@ skipping 62 matching lines @@
   dialog_->OnCancel(false);
   delete this;
 }
 
 void JavascriptAppModalDialogAndroid::DidCancelAppModalDialog(
     JNIEnv* env, jobject, bool should_suppress_js_dialogs) {
   dialog_->OnCancel(should_suppress_js_dialogs);
   delete this;
 }
 
+const ScopedJavaGlobalRef<jobject>&
+    JavascriptAppModalDialogAndroid::GetDialogObject() const {
+  return dialog_jobject_;
+}
+
+// static
+jobject GetCurrentModalDialog(JNIEnv* env, jclass clazz) {
+  AppModalDialog* dialog = AppModalDialogQueue::GetInstance()->active_dialog();
+  if (!dialog || !dialog->native_dialog())
+    return NULL;
+
+  JavascriptAppModalDialogAndroid* js_dialog =
+      static_cast<JavascriptAppModalDialogAndroid*>(dialog->native_dialog());
+  return js_dialog->GetDialogObject().obj();
+}
+
 // static
 bool JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog(
     JNIEnv* env) {
   return RegisterNativesImpl(env);
 }