Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h

chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h

Index: chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h
diff --git a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h
index 1324def1e95ccb17050b50ad806de52715efe62b..88230f3f73c099b52fc423ce6f9dd37f4bd34193 100644
--- a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h
+++ b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h
@@ -18,9 +18,11 @@ class NSAlert;
 class JavaScriptAppModalDialogHelper;
 #endif
 
-class JavaScriptAppModalDialogCocoa : public NativeAppModalDialog {
+class JavaScriptAppModalDialogCocoa
+    : public app_modal::NativeAppModalDialog {
  public:
-  explicit JavaScriptAppModalDialogCocoa(JavaScriptAppModalDialog* dialog);
+  explicit JavaScriptAppModalDialogCocoa(
+      app_modal::JavaScriptAppModalDialog* dialog);
   virtual ~JavaScriptAppModalDialogCocoa();
 
   // Overridden from NativeAppModalDialog:
@@ -31,13 +33,15 @@ class JavaScriptAppModalDialogCocoa : public NativeAppModalDialog {
   void AcceptAppModalDialog() override;
   void CancelAppModalDialog() override;
 
-  JavaScriptAppModalDialog* dialog() const { return dialog_.get(); }
+  app_modal::JavaScriptAppModalDialog* dialog() const {
+    return dialog_.get();
+  }
 
  private:
   // Returns the NSAlert associated with the modal dialog.
   NSAlert* GetAlert() const;
 
-  scoped_ptr<JavaScriptAppModalDialog> dialog_;
+  scoped_ptr<app_modal::JavaScriptAppModalDialog> dialog_;
 
   // Created in the constructor and destroyed in the destructor.
   base::scoped_nsobject<JavaScriptAppModalDialogHelper> helper_;