Move JavaScriptDialogManager, JavascriptAppModalDialogViews to components/app_modal_dialogs

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/strings/utf_string_conversions.h"
-
-#include "chrome/browser/browser_process.h"
+#include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"

[msw, 2014/11/05 23:34:37]

nit: Remove redundant include (same as first).

[oshima, 2014/11/06 00:04:32]

Done.

+#include "chrome/browser/ui/app_modal_dialogs/chrome_javascript_native_dialog_factory.h"
 #include "components/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "components/app_modal_dialogs/javascript_app_modal_dialog.h"
+#include "components/app_modal_dialogs/javascript_dialog_manager.h"
+#include "components/app_modal_dialogs/javascript_native_dialog_factory.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/base/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);
-}
 
 JavascriptAppModalDialogAndroid::JavascriptAppModalDialogAndroid(
     JNIEnv* env,
     JavaScriptAppModalDialog* dialog,
     gfx::NativeWindow parent)
     : dialog_(dialog),
       parent_jobject_weak_ref_(env, parent->GetJavaObject().obj()) {
 }
 
 int JavascriptAppModalDialogAndroid::GetAppModalDialogButtons() const {
   NOTIMPLEMENTED();
   return 0;
 }
 
 void JavascriptAppModalDialogAndroid::ShowAppModalDialog() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK_CURRENTLY_ON(content::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);
   if (parent_jobj.is_null()) {
     CancelAppModalDialog();
     return;
   }
 
@@ skipping 99 matching lines @@
 
 JavascriptAppModalDialogAndroid::~JavascriptAppModalDialogAndroid() {
   // In case the dialog is still displaying, tell it to close itself.
   // This can happen if you trigger a dialog but close the Tab before it's
   // shown, and then accept the dialog.
   if (!dialog_jobject_.is_null()) {
     JNIEnv* env = AttachCurrentThread();
     Java_JavascriptAppModalDialog_dismiss(env, dialog_jobject_.obj());
   }
 }
+
+namespace {
+
+class ChromeJavaScriptNativeDialogAndroidFactory
+    : public JavaScriptNativeDialogFactory {
+ public:
+  ChromeJavaScriptNativeDialogAndroidFactory() {}
+  ~ChromeJavaScriptNativeDialogAndroidFactory() override {}
+
+ private:
+  NativeAppModalDialog* CreateNativeJavaScriptDialog(
+      JavaScriptAppModalDialog* dialog,
+      gfx::NativeWindow parent_window) override {
+    return new JavascriptAppModalDialogAndroid(
+        base::android::AttachCurrentThread(),
+        dialog, parent_window);
+  }
+
+  DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptNativeDialogAndroidFactory);
+};
+
+}  // namespace
+
+void InstallChromeJavaScriptNativeDialogFactory() {
+  SetJavaScriptNativeDialogFactory(
+      make_scoped_ptr(new ChromeJavaScriptNativeDialogAndroidFactory));
+}
+