Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h

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 "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h"
 #include "components/app_modal/app_modal_dialog_queue.h"
 #include "components/app_modal/javascript_app_modal_dialog.h"
 #include "components/app_modal/javascript_dialog_manager.h"
 #include "components/app_modal/javascript_native_dialog_factory.h"
 #include "content/public/browser/browser_thread.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;
 
 JavascriptAppModalDialogAndroid::JavascriptAppModalDialogAndroid(
     JNIEnv* env,
-    JavaScriptAppModalDialog* dialog,
+    app_modal::JavaScriptAppModalDialog* dialog,
     gfx::NativeWindow parent)
     : dialog_(dialog),
       parent_jobject_weak_ref_(env, parent->GetJavaObject().obj()) {
 }
 
 int JavascriptAppModalDialogAndroid::GetAppModalDialogButtons() const {
   NOTIMPLEMENTED();
   return 0;
 }
 
@@ skipping 87 matching lines @@
   delete this;
 }
 
 const ScopedJavaGlobalRef<jobject>&
     JavascriptAppModalDialogAndroid::GetDialogObject() const {
   return dialog_jobject_;
 }
 
 // static
 jobject GetCurrentModalDialog(JNIEnv* env, jclass clazz) {
-  AppModalDialog* dialog = AppModalDialogQueue::GetInstance()->active_dialog();
+  app_modal::AppModalDialog* dialog =
+      app_modal::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);
 }
 
 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 app_modal::JavaScriptNativeDialogFactory {
  public:
   ChromeJavaScriptNativeDialogAndroidFactory() {}
   ~ChromeJavaScriptNativeDialogAndroidFactory() override {}
 
  private:
-  NativeAppModalDialog* CreateNativeJavaScriptDialog(
-      JavaScriptAppModalDialog* dialog,
+  app_modal::NativeAppModalDialog* CreateNativeJavaScriptDialog(
+      app_modal::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));
+  app_modal::JavaScriptDialogManager::GetInstance()->
+      SetNativeDialogFactory(
+          make_scoped_ptr(new ChromeJavaScriptNativeDialogAndroidFactory));
 }