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

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

Issue 2450173003: Add a Cocoa version of the auto-dismissing dialog. (Closed)
Patch Set: rsesek 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
Index: chrome/browser/ui/javascript_dialogs/javascript_dialog.cc
diff --git a/chrome/browser/ui/javascript_dialogs/javascript_dialog.cc b/chrome/browser/ui/javascript_dialogs/javascript_dialog.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c5e0227404bc430e5158a4434d84a9745efa9705
--- /dev/null
+++ b/chrome/browser/ui/javascript_dialogs/javascript_dialog.cc
@@ -0,0 +1,39 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#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
+
+JavaScriptDialog::~JavaScriptDialog() = default;
+
+base::WeakPtr<JavaScriptDialog> JavaScriptDialog::Create(
+ content::WebContents* parent_web_contents,
+ content::WebContents* alerting_web_contents,
+ const base::string16& title,
+ content::JavaScriptMessageType message_type,
+ const base::string16& message_text,
+ 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
+}

Powered by Google App Engine
This is Rietveld 408576698