summaryrefslogtreecommitdiffstats
path: root/extensions/components
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/components')
-rw-r--r--extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.cc12
-rw-r--r--extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.h6
2 files changed, 13 insertions, 5 deletions
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_