| 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
|
| index c5e0227404bc430e5158a4434d84a9745efa9705..256e159c96db72c7704de9778039b6893fa7968b 100644
|
| --- a/chrome/browser/ui/javascript_dialogs/javascript_dialog.cc
|
| +++ b/chrome/browser/ui/javascript_dialogs/javascript_dialog.cc
|
| @@ -4,14 +4,8 @@
|
|
|
| #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(
|
| @@ -23,17 +17,7 @@ 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
|
| + return JavaScriptDialogViews::Create(
|
| + parent_web_contents, alerting_web_contents, title, message_type,
|
| + message_text, default_prompt_text, dialog_callback);
|
| }
|
|
|