Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h

athena/extensions/athena_javascript_native_dialog_factory.cc

Index: athena/extensions/athena_javascript_native_dialog_factory.cc
diff --git a/athena/extensions/athena_javascript_native_dialog_factory.cc b/athena/extensions/athena_javascript_native_dialog_factory.cc
index 6883a9e5360a9435505ca487b2891396bfb93d3a..8806ecc16eaa37c6babdaa7377eff255c93d4566 100644
--- a/athena/extensions/athena_javascript_native_dialog_factory.cc
+++ b/athena/extensions/athena_javascript_native_dialog_factory.cc
@@ -17,18 +17,18 @@ namespace athena {
 namespace {
 
 class AthenaJavaScriptNativeDialogFactory
-    : public JavaScriptNativeDialogFactory {
+    : public app_modal_dialogs::JavaScriptNativeDialogFactory {
  public:
   AthenaJavaScriptNativeDialogFactory() {}
   ~AthenaJavaScriptNativeDialogFactory() override {}
 
  private:
   // JavScriptNativeDialogFactory:

[msw, 2014/11/11 08:34:53]

nit: app_modal_dialogs:: namespace in comment.

[oshima, 2014/11/11 18:19:48]

Done.

-  NativeAppModalDialog* CreateNativeJavaScriptDialog(
-      JavaScriptAppModalDialog* dialog,
+  app_modal_dialogs::NativeAppModalDialog* CreateNativeJavaScriptDialog(
+      app_modal_dialogs::JavaScriptAppModalDialog* dialog,
       gfx::NativeWindow parent_window) override{
-    JavaScriptAppModalDialogViews* d =
-        new JavaScriptAppModalDialogViews(dialog);
+    app_modal_dialogs::JavaScriptAppModalDialogViews* d =
+        new app_modal_dialogs::JavaScriptAppModalDialogViews(dialog);
     CreateBrowserModalDialogViews(d, parent_window);
     return d;
   }
@@ -39,8 +39,9 @@ class AthenaJavaScriptNativeDialogFactory
 }  // namespace
 
 void InstallJavaScriptNativeDialogFactory() {
-  SetJavaScriptNativeDialogFactory(
-      make_scoped_ptr(new AthenaJavaScriptNativeDialogFactory));
+  app_modal_dialogs::JavaScriptDialogManager::GetInstance()->
+      SetNativeDialogFactory(
+          make_scoped_ptr(new AthenaJavaScriptNativeDialogFactory));
 }
 
 }  // namespace athena