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

Unified Diff: chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm

Issue 666533007: Move JavaScriptDialogManager, JavascriptAppModalDialogViews to components/app_modal_dialogs (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: 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
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
index 37c4ad7a132ca5d0b88ebad58f7fe2a403d9e321..214e1380953072a90a4ec16484f24f2dffa7357a 100644
--- a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
+++ b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
@@ -11,8 +11,10 @@
#import "base/mac/foundation_util.h"
#include "base/strings/sys_string_conversions.h"
#import "chrome/browser/chrome_browser_application_mac.h"
-#include "chrome/grit/generated_resources.h"
+#include "chrome/browser/ui/app_modal_dialogs/chrome_javascript_native_dialog_factory.h"
#include "components/app_modal_dialogs/javascript_app_modal_dialog.h"
+#include "components/app_modal_dialogs/javascript_dialog_manager.h"
+#include "components/app_modal_dialogs/javascript_native_dialog_factory.h"
#include "grit/components_strings.h"
#include "ui/base/l10n/l10n_util_mac.h"
#include "ui/base/ui_base_types.h"
@@ -435,12 +437,27 @@ void JavaScriptAppModalDialogCocoa::CancelAppModalDialog() {
[helper_ playOrQueueAction:ACTION_CANCEL];
}
-////////////////////////////////////////////////////////////////////////////////
-// NativeAppModalDialog, public:
+namespace {
+
+class ChromeJavaScritpNativeDialogCocoaFactory
+ : public JavaScriptNativeDialogFactory {
+ public:
+ ChromeJavaScritpNativeDialogCocoaFactory() {}
Jiang Jiang 2014/11/18 13:03:05 Typo.
+ ~ChromeJavaScritpNativeDialogCocoaFactory() override {}
+
+ private:
+ NativeAppModalDialog* CreateNativeJavaScriptDialog(
+ JavaScriptAppModalDialog* dialog,
+ gfx::NativeWindow parent_window) override {
+ return new JavaScriptAppModalDialogCocoa(dialog);
+ }
+
+ DISALLOW_COPY_AND_ASSIGN(ChromeJavaScritpNativeDialogCocoaFactory);
+};
+
+} // namespace
-// static
-NativeAppModalDialog* NativeAppModalDialog::CreateNativeJavaScriptPrompt(
- JavaScriptAppModalDialog* dialog,
- gfx::NativeWindow parent_window) {
- return new JavaScriptAppModalDialogCocoa(dialog);
+void InstallChromeJavaScriptNativeDialogFactory() {
+ SetJavaScriptNativeDialogFactory(
+ make_scoped_ptr(new ChromeJavaScritpNativeDialogCocoaFactory));
}
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698