Rename JavaScript "messages" to "dialogs".

chrome/browser/ui/javascript_dialogs/javascript_dialog_cocoa.mm

 // 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_cocoa.h"
 
 #import "base/mac/scoped_nsobject.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/sys_string_conversions.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
 #import "chrome/browser/ui/cocoa/key_equivalent_constants.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/strings/grit/ui_strings.h"
 
 @class JavaScriptDialogCocoaBridge;
 
 class JavaScriptDialogCocoa::JavaScriptDialogCocoaImpl
     : public ConstrainedWindowMacDelegate {
  public:
   JavaScriptDialogCocoaImpl(
       JavaScriptDialogCocoa* parent,
       content::WebContents* parent_web_contents,
       content::WebContents* alerting_web_contents,
       const base::string16& title,
-      content::JavaScriptMessageType message_type,
+      content::JavaScriptDialogType dialog_type,
       const base::string16& message_text,
       const base::string16& default_prompt_text,
       const content::JavaScriptDialogManager::DialogClosedCallback&
           dialog_callback);
   virtual ~JavaScriptDialogCocoaImpl() = default;
 
   // Callbacks from the bridge when buttons are clicked.
   void Accept();
   void Cancel();
 
@@ skipping 37 matching lines @@
   dialogImpl_->Cancel();
 }
 
 @end
 
 JavaScriptDialogCocoa::JavaScriptDialogCocoaImpl::JavaScriptDialogCocoaImpl(
     JavaScriptDialogCocoa* parent,
     content::WebContents* parent_web_contents,
     content::WebContents* alerting_web_contents,
     const base::string16& title,
-    content::JavaScriptMessageType message_type,
+    content::JavaScriptDialogType dialog_type,
     const base::string16& message_text,
     const base::string16& default_prompt_text,
     const content::JavaScriptDialogManager::DialogClosedCallback&
         dialog_callback)
     : dialog_callback_(dialog_callback), parent_(parent) {
   bridge_.reset([[JavaScriptDialogCocoaBridge alloc] initWithDialogImpl:this]);
 
   alert_.reset([[ConstrainedWindowAlert alloc] init]);
   [alert_ setMessageText:base::SysUTF16ToNSString(title)];
   [alert_ setInformativeText:base::SysUTF16ToNSString(message_text)];
   [alert_ addButtonWithTitle:l10n_util::GetNSStringWithFixup(IDS_APP_OK)
                keyEquivalent:kKeyEquivalentReturn
                       target:bridge_
                       action:@selector(onAcceptButton:)];
-  if (message_type != content::JAVASCRIPT_MESSAGE_TYPE_ALERT) {
+  if (dialog_type != content::JAVASCRIPT_DIALOG_TYPE_ALERT) {
     [alert_ addButtonWithTitle:l10n_util::GetNSStringWithFixup(IDS_APP_CANCEL)
                  keyEquivalent:kKeyEquivalentEscape
                         target:bridge_
                         action:@selector(onCancelButton:)];
   }
-  if (message_type == content::JAVASCRIPT_MESSAGE_TYPE_PROMPT) {
+  if (dialog_type == content::JAVASCRIPT_DIALOG_TYPE_PROMPT) {
     textField_.reset(
         [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, 460, 22)]);
     [[textField_ cell] setLineBreakMode:NSLineBreakByTruncatingTail];
     [textField_ setStringValue:base::SysUTF16ToNSString(default_prompt_text)];
     [alert_ setAccessoryView:textField_];
   }
   [[alert_ closeButton] removeFromSuperview];
   [alert_ layout];
 
   base::scoped_nsobject<CustomConstrainedWindowSheet> sheet(
@@ skipping 29 matching lines @@
   window_->CloseWebContentsModalDialog();
 }
 
 JavaScriptDialogCocoa::~JavaScriptDialogCocoa() = default;
 
 // static
 base::WeakPtr<JavaScriptDialogCocoa> JavaScriptDialogCocoa::Create(
     content::WebContents* parent_web_contents,
     content::WebContents* alerting_web_contents,
     const base::string16& title,
-    content::JavaScriptMessageType message_type,
+    content::JavaScriptDialogType dialog_type,
     const base::string16& message_text,
     const base::string16& default_prompt_text,
     const content::JavaScriptDialogManager::DialogClosedCallback&
         dialog_callback) {
   return (new JavaScriptDialogCocoa(parent_web_contents, alerting_web_contents,
-                                    title, message_type, message_text,
+                                    title, dialog_type, message_text,
                                     default_prompt_text, dialog_callback))
       ->weak_factory_.GetWeakPtr();
 }
 
 void JavaScriptDialogCocoa::CloseDialogWithoutCallback() {
   impl_->dialog_callback_.Reset();
   impl_->window_->CloseWebContentsModalDialog();
 }
 
 JavaScriptDialogCocoa::JavaScriptDialogCocoa(
     content::WebContents* parent_web_contents,
     content::WebContents* alerting_web_contents,
     const base::string16& title,
-    content::JavaScriptMessageType message_type,
+    content::JavaScriptDialogType dialog_type,
     const base::string16& message_text,
     const base::string16& default_prompt_text,
     const content::JavaScriptDialogManager::DialogClosedCallback&
         dialog_callback)
     : JavaScriptDialog(parent_web_contents),
       impl_(base::MakeUnique<JavaScriptDialogCocoaImpl>(this,
                                                         parent_web_contents,
                                                         alerting_web_contents,
                                                         title,
-                                                        message_type,
+                                                        dialog_type,
                                                         message_text,
                                                         default_prompt_text,
                                                         dialog_callback)),
       weak_factory_(this) {}