Split javascript_dialogs.cc into views and cocoa+views versions.

chrome/browser/ui/javascript_dialogs/javascript_dialog_mac.cc

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 93%
copy from chrome/browser/ui/javascript_dialogs/javascript_dialog.cc
copy to chrome/browser/ui/javascript_dialogs/javascript_dialog_mac.cc
index c5e0227404bc430e5158a4434d84a9745efa9705..05457d014e93077b17210197cf6e837905393d63 100644
--- a/chrome/browser/ui/javascript_dialogs/javascript_dialog.cc
+++ b/chrome/browser/ui/javascript_dialogs/javascript_dialog_mac.cc
@@ -5,12 +5,9 @@
 #include "chrome/browser/ui/javascript_dialogs/javascript_dialog.h"
 
 #include "build/build_config.h"

[Avi (use Gerrit), 2016/10/28 04:27:50]

you don't need this

[tapted, 2016/10/28 04:48:25]

Done.

-#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 +20,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
 }