Rename JavaScript "messages" to "dialogs".

content/shell/browser/shell_javascript_dialog_manager.cc

 // Copyright 2013 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 "content/shell/browser/shell_javascript_dialog_manager.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/web_contents.h"
 #include "content/shell/browser/shell_javascript_dialog.h"
 #include "content/shell/common/shell_switches.h"
 
 namespace content {
 
 ShellJavaScriptDialogManager::ShellJavaScriptDialogManager()
     : should_proceed_on_beforeunload_(true) {}
 
 ShellJavaScriptDialogManager::~ShellJavaScriptDialogManager() {
 }
 
 void ShellJavaScriptDialogManager::RunJavaScriptDialog(
     WebContents* web_contents,
     const GURL& origin_url,
-    JavaScriptMessageType javascript_message_type,
+    JavaScriptDialogType dialog_type,
     const base::string16& message_text,
     const base::string16& default_prompt_text,
     const DialogClosedCallback& callback,
     bool* did_suppress_message) {
   if (!dialog_request_callback_.is_null()) {
     dialog_request_callback_.Run();
     callback.Run(true, base::string16());
     dialog_request_callback_.Reset();
     return;
   }
 
 #if defined(OS_MACOSX) || defined(OS_WIN)
   *did_suppress_message = false;
 
   if (dialog_) {
     // One dialog at a time, please.
     *did_suppress_message = true;
     return;
   }
 
   base::string16 new_message_text =
       url_formatter::FormatUrl(origin_url) +
       base::ASCIIToUTF16("\n\n") + message_text;
   gfx::NativeWindow parent_window = web_contents->GetTopLevelNativeWindow();
 
-  dialog_.reset(new ShellJavaScriptDialog(this,
-                                          parent_window,
-                                          javascript_message_type,
-                                          new_message_text,
-                                          default_prompt_text,
+  dialog_.reset(new ShellJavaScriptDialog(this, parent_window, dialog_type,
+                                          new_message_text, default_prompt_text,
                                           callback));
 #else
   // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
   *did_suppress_message = true;
   return;
 #endif
 }
 
 void ShellJavaScriptDialogManager::RunBeforeUnloadDialog(
     WebContents* web_contents,
@@ skipping 16 matching lines @@
     // Seriously!?
     callback.Run(true, base::string16());
     return;
   }
 
   base::string16 message_text =
       base::ASCIIToUTF16("Is it OK to leave/reload this page?");
 
   gfx::NativeWindow parent_window = web_contents->GetTopLevelNativeWindow();
 
-  dialog_.reset(new ShellJavaScriptDialog(this,
-                                          parent_window,
-                                          JAVASCRIPT_MESSAGE_TYPE_CONFIRM,
-                                          message_text,
-                                          base::string16(),  // default
-                                          callback));
+  dialog_.reset(new ShellJavaScriptDialog(
+      this, parent_window, JAVASCRIPT_DIALOG_TYPE_CONFIRM, message_text,
+      base::string16(),  // default
+      callback));
 #else
   // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
   callback.Run(true, base::string16());
   return;
 #endif
 }
 
 void ShellJavaScriptDialogManager::CancelDialogs(WebContents* web_contents,
                                                  bool reset_state) {
 #if defined(OS_MACOSX) || defined(OS_WIN)
@@ skipping 17 matching lines @@
 void ShellJavaScriptDialogManager::DialogClosed(ShellJavaScriptDialog* dialog) {
 #if defined(OS_MACOSX) || defined(OS_WIN)
   DCHECK_EQ(dialog, dialog_.get());
   dialog_.reset();
 #else
   // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
 #endif
 }
 
 }  // namespace content