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

Unified Diff: chrome/browser/ui/javascript_dialogs/javascript_dialog_mac.cc

Issue 2458903002: Split javascript_dialogs.cc into views and cocoa+views versions. (Closed)
Patch Set: -build_config.h Created 4 years, 2 months 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/javascript_dialogs/javascript_dialog.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/javascript_dialogs/javascript_dialog_mac.cc
diff --git a/chrome/browser/ui/javascript_dialogs/javascript_dialog.cc b/chrome/browser/ui/javascript_dialogs/javascript_dialog_mac.cc
similarity index 91%
copy from chrome/browser/ui/javascript_dialogs/javascript_dialog.cc
copy to chrome/browser/ui/javascript_dialogs/javascript_dialog_mac.cc
index c5e0227404bc430e5158a4434d84a9745efa9705..119c3ea6378d25571bf17112c74209baeb5b8100 100644
--- a/chrome/browser/ui/javascript_dialogs/javascript_dialog.cc
+++ b/chrome/browser/ui/javascript_dialogs/javascript_dialog_mac.cc
@@ -4,13 +4,9 @@
#include "chrome/browser/ui/javascript_dialogs/javascript_dialog.h"
-#include "build/build_config.h"
-#include "chrome/browser/ui/javascript_dialogs/javascript_dialog_views.h"
-
-#if defined(OS_MACOSX)
#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/browser/ui/javascript_dialogs/javascript_dialog_cocoa.h"
-#endif
+#include "chrome/browser/ui/javascript_dialogs/javascript_dialog_views.h"
JavaScriptDialog::~JavaScriptDialog() = default;
@@ -23,17 +19,13 @@ base::WeakPtr<JavaScriptDialog> JavaScriptDialog::Create(
const base::string16& default_prompt_text,
const content::JavaScriptDialogManager::DialogClosedCallback&
dialog_callback) {
-#if defined(OS_MACOSX)
if (chrome::ToolkitViewsWebUIDialogsEnabled()) {
-#endif
return JavaScriptDialogViews::Create(
parent_web_contents, alerting_web_contents, title, message_type,
message_text, default_prompt_text, dialog_callback);
-#if defined(OS_MACOSX)
} else {
return JavaScriptDialogCocoa::Create(
parent_web_contents, alerting_web_contents, title, message_type,
message_text, default_prompt_text, dialog_callback);
}
-#endif
}
« no previous file with comments | « chrome/browser/ui/javascript_dialogs/javascript_dialog.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698