Add a Cocoa version of the auto-dismissing dialog.

chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.cc

 // 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_tab_helper.h"
 
 #include "base/bind.h"
 #include "base/feature_list.h"
 #include "base/metrics/histogram_macros.h"
+#include "build/build_config.h"
 #include "chrome/browser/engagement/site_engagement_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/javascript_dialogs/javascript_dialog_views.h"
 #include "chrome/browser/ui/tab_modal_confirm_dialog.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "components/app_modal/javascript_dialog_manager.h"
 #include "content/public/browser/web_contents_delegate.h"
 
+#if defined(OS_MACOSX)
+#include "chrome/browser/ui/browser_dialogs.h"
+#include "chrome/browser/ui/javascript_dialogs/javascript_dialog_cocoa.h"
+#endif
+
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(JavaScriptDialogTabHelper);
 
 namespace {
 
 const base::Feature kAutoDismissingDialogsFeature{
     "AutoDismissingDialogs", base::FEATURE_DISABLED_BY_DEFAULT};
 
 bool IsEnabled() {
   return base::FeatureList::IsEnabled(kAutoDismissingDialogsFeature);
 }
@@ skipping 62 matching lines @@
       // There's already a dialog up; clear it out.
       CloseDialog(false, false, base::string16());
     }
 
     parent_web_contents->GetDelegate()->ActivateContents(parent_web_contents);
 
     base::string16 title =
         AppModalDialogManager()->GetTitle(alerting_web_contents, origin_url);
     dialog_callback_ = callback;
     BrowserList::AddObserver(this);
-    // TODO(avi): abstract out so that we have a Mac version too...
-    dialog_ = JavaScriptDialogViews::Create(
-        parent_web_contents, alerting_web_contents, title, message_type,
-        message_text, default_prompt_text, callback);
+#if defined(OS_MACOSX)

[Robert Sesek, 2016/10/27 15:17:24]

Alternatively, this block could be in JavaScriptDialog::Create.

[Avi (use Gerrit), 2016/10/27 18:41:22]

Yes, that would be cleaner. Done.

+    if (!chrome::ToolkitViewsWebUIDialogsEnabled()) {
+      dialog_ = JavaScriptDialogCocoa::Create(
+          parent_web_contents, alerting_web_contents, title, message_type,
+          message_text, default_prompt_text, callback);
+    } else {
+#endif
+      dialog_ = JavaScriptDialogViews::Create(
+          parent_web_contents, alerting_web_contents, title, message_type,
+          message_text, default_prompt_text, callback);
+#if defined(OS_MACOSX)
+    }
+#endif
 
     // Message suppression is something that we don't give the user a checkbox
     // for any more. It was useful back in the day when dialogs were app-modal
     // and clicking the checkbox was the only way to escape a loop that the page
     // was doing, but now the user can just close the page.
     *did_suppress_message = false;
   } else {
     AppModalDialogManager()->RunJavaScriptDialog(
         alerting_web_contents, origin_url, message_type, message_text,
         default_prompt_text, callback, did_suppress_message);
@@ skipping 88 matching lines @@
   DCHECK(dialog_);
 
   dialog_->CloseDialogWithoutCallback();
   if (!suppress_callback)
     dialog_callback_.Run(success, user_input);
 
   dialog_.reset();
   dialog_callback_.Reset();
   BrowserList::RemoveObserver(this);
 }