diff options
| author | oshima <oshima@chromium.org> | 2014-11-19 14:21:03 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-19 22:21:32 +0000 |
| commit | 0929be2a6d3e1880cfb047a7adc1c3e8e6dd5285 (patch) | |
| tree | cb838d09bb51fca863e1225c1a91f09518fa3653 /extensions/components | |
| parent | 8d4fc306580f056833a10dd6f0b55f8d2d665602 (diff) | |
| download | chromium_src-0929be2a6d3e1880cfb047a7adc1c3e8e6dd5285.zip chromium_src-0929be2a6d3e1880cfb047a7adc1c3e8e6dd5285.tar.gz chromium_src-0929be2a6d3e1880cfb047a7adc1c3e8e6dd5285.tar.bz2 | |
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}
Diffstat (limited to 'extensions/components')
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_ |