Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(742)

Unified Diff: content/shell/browser/shell_javascript_dialog_manager.cc

Issue 2684093002: Rename JavaScript "messages" to "dialogs". (Closed)
Patch Set: win fox Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/browser/shell_javascript_dialog_manager.cc
diff --git a/content/shell/browser/shell_javascript_dialog_manager.cc b/content/shell/browser/shell_javascript_dialog_manager.cc
index f720f80f953519ad0dca43c8447b929afd73c3f1..b7991cb243e8f128039738017df7863eb4371a17 100644
--- a/content/shell/browser/shell_javascript_dialog_manager.cc
+++ b/content/shell/browser/shell_javascript_dialog_manager.cc
@@ -24,7 +24,7 @@ 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,
@@ -50,11 +50,8 @@ void ShellJavaScriptDialogManager::RunJavaScriptDialog(
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
@@ -91,12 +88,10 @@ void ShellJavaScriptDialogManager::RunBeforeUnloadDialog(
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());
« no previous file with comments | « content/shell/browser/shell_javascript_dialog_manager.h ('k') | content/shell/browser/shell_javascript_dialog_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698