Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2478)

Unified Diff: athena/extensions/athena_javascript_native_dialog_factory.cc

Issue 692563002: JS dialogs for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix deps Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
« no previous file with comments | « athena/extensions/athena_javascript_native_dialog_factory.h ('k') | athena/extensions/extensions_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698