Rename JavaScript "messages" to "dialogs".

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/callback.h"
 #include "base/feature_list.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 72 matching lines @@
 }
 
 void JavaScriptDialogTabHelper::SetDialogShownCallbackForTesting(
     base::Closure callback) {
   dialog_shown_ = callback;
 }
 
 void JavaScriptDialogTabHelper::RunJavaScriptDialog(
     content::WebContents* alerting_web_contents,
     const GURL& origin_url,
-    content::JavaScriptMessageType message_type,
+    content::JavaScriptDialogType dialog_type,
     const base::string16& message_text,
     const base::string16& default_prompt_text,
     const DialogClosedCallback& callback,
     bool* did_suppress_message) {
   SiteEngagementService* site_engagement_service = SiteEngagementService::Get(
       Profile::FromBrowserContext(alerting_web_contents->GetBrowserContext()));
   double engagement_score = site_engagement_service->GetScore(origin_url);
   int32_t message_length = static_cast<int32_t>(message_text.length());
   if (engagement_score == 0) {
     UMA_HISTOGRAM_COUNTS("JSDialogs.CharacterCount.EngagementNone",
                          message_length);
   } else if (engagement_score < 1) {
     UMA_HISTOGRAM_COUNTS("JSDialogs.CharacterCount.EngagementLessThanOne",
                          message_length);
   } else if (engagement_score < 5) {
     UMA_HISTOGRAM_COUNTS("JSDialogs.CharacterCount.EngagementOneToFive",
                          message_length);
   } else {
     UMA_HISTOGRAM_COUNTS("JSDialogs.CharacterCount.EngagementHigher",
                          message_length);
   }
 
   content::WebContents* parent_web_contents =
       WebContentsObserver::web_contents();
   bool foremost = IsWebContentsForemost(parent_web_contents);
-  switch (message_type) {
-    case content::JAVASCRIPT_MESSAGE_TYPE_ALERT:
+  switch (dialog_type) {
+    case content::JAVASCRIPT_DIALOG_TYPE_ALERT:
       UMA_HISTOGRAM_BOOLEAN("JSDialogs.IsForemost.Alert", foremost);
       break;
-    case content::JAVASCRIPT_MESSAGE_TYPE_CONFIRM:
+    case content::JAVASCRIPT_DIALOG_TYPE_CONFIRM:
       UMA_HISTOGRAM_BOOLEAN("JSDialogs.IsForemost.Confirm", foremost);
       break;
-    case content::JAVASCRIPT_MESSAGE_TYPE_PROMPT:
+    case content::JAVASCRIPT_DIALOG_TYPE_PROMPT:
       UMA_HISTOGRAM_BOOLEAN("JSDialogs.IsForemost.Prompt", foremost);
       break;
   }
 
   if (IsEnabled()) {
     if (!IsWebContentsForemost(parent_web_contents) &&
-        message_type == content::JAVASCRIPT_MESSAGE_TYPE_PROMPT) {
+        dialog_type == content::JAVASCRIPT_DIALOG_TYPE_PROMPT) {
       // Don't allow "prompt" dialogs to steal the user's focus. TODO(avi):
       // Eventually, for subsequent phases of http://bit.ly/project-oldspice,
       // turn off focus stealing for other dialog types.
       *did_suppress_message = true;
       alerting_web_contents->GetMainFrame()->AddMessageToConsole(
           content::CONSOLE_MESSAGE_LEVEL_WARNING,
           "A window.prompt() dialog generated by this page was suppressed "
           "because this page is not the active tab of the front window. "
           "Please make sure your dialogs are triggered by user interactions "
           "to avoid this situation. "
           "https://www.chromestatus.com/feature/5637107137642496");
       return;
     }
 
     if (dialog_) {
       // There's already a dialog up; clear it out.
       CloseDialog(false, base::string16(),
                   DismissalCause::SUBSEQUENT_DIALOG_SHOWN);
     }
 
     base::string16 title =
         AppModalDialogManager()->GetTitle(alerting_web_contents, origin_url);
     dialog_callback_ = callback;
-    message_type_ = message_type;
+    dialog_type_ = dialog_type;
     dialog_ = JavaScriptDialog::Create(
-        parent_web_contents, alerting_web_contents, title, message_type,
+        parent_web_contents, alerting_web_contents, title, dialog_type,
         message_text, default_prompt_text,
         base::Bind(&JavaScriptDialogTabHelper::OnDialogClosed,
                    base::Unretained(this), callback));
 
     BrowserList::AddObserver(this);
 
     // 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;
 
     if (!dialog_shown_.is_null()) {
       dialog_shown_.Run();
       dialog_shown_.Reset();
     }
   } else {
     AppModalDialogManager()->RunJavaScriptDialog(
-        alerting_web_contents, origin_url, message_type, message_text,
+        alerting_web_contents, origin_url, dialog_type, message_text,
         default_prompt_text, callback, did_suppress_message);
   }
 
   if (did_suppress_message) {
     UMA_HISTOGRAM_COUNTS("JSDialogs.CharacterCountUserSuppressed",
                          message_length);
   }
 }
 
 namespace {
@@ skipping 93 matching lines @@
 }
 
 void JavaScriptDialogTabHelper::OnBrowserSetLastActive(Browser* browser) {
   if (dialog_ && !IsWebContentsForemost(web_contents())) {
     CloseDialog(false, base::string16(), DismissalCause::BROWSER_SWITCHED);
   }
 }
 
 void JavaScriptDialogTabHelper::LogDialogDismissalCause(
     JavaScriptDialogTabHelper::DismissalCause cause) {
-  switch (message_type_) {
-    case content::JAVASCRIPT_MESSAGE_TYPE_ALERT:
+  switch (dialog_type_) {
+    case content::JAVASCRIPT_DIALOG_TYPE_ALERT:
       UMA_HISTOGRAM_ENUMERATION("JSDialogs.DismissalCause.Alert",
                                 static_cast<int>(cause),
                                 static_cast<int>(DismissalCause::MAX));
       break;
-    case content::JAVASCRIPT_MESSAGE_TYPE_CONFIRM:
+    case content::JAVASCRIPT_DIALOG_TYPE_CONFIRM:
       UMA_HISTOGRAM_ENUMERATION("JSDialogs.DismissalCause.Confirm",
                                 static_cast<int>(cause),
                                 static_cast<int>(DismissalCause::MAX));
       break;
-    case content::JAVASCRIPT_MESSAGE_TYPE_PROMPT:
+    case content::JAVASCRIPT_DIALOG_TYPE_PROMPT:
       UMA_HISTOGRAM_ENUMERATION("JSDialogs.DismissalCause.Prompt",
                                 static_cast<int>(cause),
                                 static_cast<int>(DismissalCause::MAX));
       break;
   }
 }
 
 void JavaScriptDialogTabHelper::OnDialogClosed(
     DialogClosedCallback callback,
     bool success,
@@ skipping 14 matching lines @@
   dialog_callback_.Run(success, user_input);
 
   ClearDialogInfo();
 }
 
 void JavaScriptDialogTabHelper::ClearDialogInfo() {
   dialog_.reset();
   dialog_callback_.Reset();
   BrowserList::RemoveObserver(this);
 }