| Index: athena/extensions/athena_javascript_native_dialog_factory.cc
|
| diff --git a/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc b/athena/extensions/athena_javascript_native_dialog_factory.cc
|
| similarity index 51%
|
| copy from chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc
|
| copy to athena/extensions/athena_javascript_native_dialog_factory.cc
|
| index 8a40a2ff9ec09ef12477c3e38f666071b47771dc..6883a9e5360a9435505ca487b2891396bfb93d3a 100644
|
| --- a/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc
|
| +++ b/athena/extensions/athena_javascript_native_dialog_factory.cc
|
| @@ -2,46 +2,45 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/ui/app_modal_dialogs/chrome_javascript_native_dialog_factory.h"
|
| +#include "athena/extensions/athena_javascript_native_dialog_factory.h"
|
|
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "components/app_modal_dialogs/javascript_dialog_manager.h"
|
| #include "components/app_modal_dialogs/javascript_native_dialog_factory.h"
|
| +#include "components/app_modal_dialogs/views/javascript_app_modal_dialog_views.h"
|
| #include "components/constrained_window/constrained_window_views.h"
|
|
|
| -#if defined(USE_X11) && !defined(OS_CHROMEOS)
|
| -#include "chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.h"
|
| -#else
|
| -#include "components/app_modal_dialogs/views/javascript_app_modal_dialog_views.h"
|
| -#endif
|
| +class JavaScriptAppModalDialog;
|
| +class NativeAppModalDialog;
|
|
|
| +namespace athena {
|
| namespace {
|
|
|
| -class ChromeJavaScriptNativeDialogViewsFactory
|
| +class AthenaJavaScriptNativeDialogFactory
|
| : public JavaScriptNativeDialogFactory {
|
| public:
|
| - ChromeJavaScriptNativeDialogViewsFactory() {}
|
| - ~ChromeJavaScriptNativeDialogViewsFactory() override {}
|
| + AthenaJavaScriptNativeDialogFactory() {}
|
| + ~AthenaJavaScriptNativeDialogFactory() override {}
|
|
|
| private:
|
| + // JavScriptNativeDialogFactory:
|
| NativeAppModalDialog* CreateNativeJavaScriptDialog(
|
| JavaScriptAppModalDialog* dialog,
|
| gfx::NativeWindow parent_window) override{
|
| - JavaScriptAppModalDialogViews* d = nullptr;
|
| -#if defined(USE_X11) && !defined(OS_CHROMEOS)
|
| - d = new JavaScriptAppModalDialogViewsX11(dialog);
|
| -#else
|
| - d = new JavaScriptAppModalDialogViews(dialog);
|
| -#endif
|
| + JavaScriptAppModalDialogViews* d =
|
| + new JavaScriptAppModalDialogViews(dialog);
|
| CreateBrowserModalDialogViews(d, parent_window);
|
| return d;
|
| }
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptNativeDialogViewsFactory);
|
| + DISALLOW_COPY_AND_ASSIGN(AthenaJavaScriptNativeDialogFactory);
|
| };
|
|
|
| } // namespace
|
|
|
| -void InstallChromeJavaScriptNativeDialogFactory() {
|
| +void InstallJavaScriptNativeDialogFactory() {
|
| SetJavaScriptNativeDialogFactory(
|
| - make_scoped_ptr(new ChromeJavaScriptNativeDialogViewsFactory));
|
| + make_scoped_ptr(new AthenaJavaScriptNativeDialogFactory));
|
| }
|
| +
|
| +} // namespace athena
|
|
|