From 0929be2a6d3e1880cfb047a7adc1c3e8e6dd5285 Mon Sep 17 00:00:00 2001
From: oshima <oshima@chromium.org>
Date: Wed, 19 Nov 2014 14:21:03 -0800
Subject: Consolidate javascript_dialog_manager.h and
 javascript_dialog_manager_impl.h

* Renamed JavaScriptDialgoManagerImpl to JavaScriptDialogManager.
* Add namespace app_modal_dialogs
* Add namespace javascript_dialog_extensions_client
* Shortened InstallJavaScriptDialogExtensionsClient to InstallClient to fit the 80 chars limit.

BUG=410499
TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/688853005

Cr-Commit-Position: refs/heads/master@{#304903}
---
 .../javascript_dialog_extension_client_impl.cc               | 12 ++++++++----
 .../javascript_dialog_extension_client_impl.h                |  6 +++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'extensions/components')

diff --git a/extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.cc b/extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.cc
index ddf0272..f50b4e9 100644
--- a/extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.cc
+++ b/extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.cc
@@ -11,6 +11,7 @@
 #include "extensions/common/extension.h"
 #include "ui/gfx/native_widget_types.h"
 
+namespace javascript_dialog_extensions_client {
 namespace {
 
 using extensions::Extension;
@@ -30,7 +31,7 @@ const Extension* GetExtensionForWebContents(
 }
 
 class JavaScriptDialogExtensionsClientImpl
-    : public JavaScriptDialogExtensionsClient {
+    : public app_modal::JavaScriptDialogExtensionsClient {
  public:
   JavaScriptDialogExtensionsClientImpl() {}
   ~JavaScriptDialogExtensionsClientImpl() override {}
@@ -74,7 +75,10 @@ class JavaScriptDialogExtensionsClientImpl
 
 }  // namespace
 
-void InstallJavaScriptDialogExtensionsClient() {
-  SetJavaScriptDialogExtensionsClient(
-      make_scoped_ptr(new JavaScriptDialogExtensionsClientImpl));
+void InstallClient() {
+  app_modal::JavaScriptDialogManager::GetInstance()->
+      SetExtensionsClient(
+          make_scoped_ptr(new JavaScriptDialogExtensionsClientImpl));
 }
+
+}  // namespace javascript_dialog_extensions_client
diff --git a/extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.h b/extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.h
index 7aa2d22..b94fff2 100644
--- a/extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.h
+++ b/extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.h
@@ -5,7 +5,11 @@
 #ifndef EXTENSIONS_COMPONENTS_JAVASCRIPT_DIALOG_EXTENSIONS_CLIENT_JAVASCRIPT_DIALOG_EXTENSION_CLIENT_IMPL_H_
 #define EXTENSIONS_COMPONENTS_JAVASCRIPT_DIALOG_EXTENSIONS_CLIENT_JAVASCRIPT_DIALOG_EXTENSION_CLIENT_IMPL_H_
 
-void InstallJavaScriptDialogExtensionsClient();
+namespace javascript_dialog_extensions_client {
+
+void InstallClient();
+
+}  // namespace javascript_dialog_extensions_client
 
 #endif  // EXTENSIONS_COMPONENTS_JAVASCRIPT_DIALOG_EXTENSIONS_CLIENT_JAVASCRIPT_DIALOG_EXTENSION_CLIENT_IMPL_H_
 
-- 
cgit v1.1