diff options
| author | avi <avi@chromium.org> | 2016-03-11 14:27:42 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-11 22:29:10 +0000 |
| commit | 141dbc132f8aa2588fad4cf50fbfd7a319234b61 (patch) | |
| tree | dd6936cfa5cf47c54eef1755c3c674bc3cae6b08 /content/shell/browser | |
| parent | 6b3616d180a599aba1f2cbc734682454222efc39 (diff) | |
| download | chromium_src-141dbc132f8aa2588fad4cf50fbfd7a319234b61.zip chromium_src-141dbc132f8aa2588fad4cf50fbfd7a319234b61.tar.gz chromium_src-141dbc132f8aa2588fad4cf50fbfd7a319234b61.tar.bz2 | |
Remove the ability of webpages to specify strings for the onbeforeunload dialog.
BUG=587940
TEST=as in bug
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
Review URL: https://codereview.chromium.org/1714573002
Cr-Commit-Position: refs/heads/master@{#380755}
Diffstat (limited to 'content/shell/browser')
4 files changed, 3 insertions, 8 deletions
diff --git a/content/shell/browser/layout_test/layout_test_javascript_dialog_manager.cc b/content/shell/browser/layout_test/layout_test_javascript_dialog_manager.cc index 969b680..adea594 100644 --- a/content/shell/browser/layout_test/layout_test_javascript_dialog_manager.cc +++ b/content/shell/browser/layout_test/layout_test_javascript_dialog_manager.cc @@ -35,7 +35,6 @@ void LayoutTestJavaScriptDialogManager::RunJavaScriptDialog( void LayoutTestJavaScriptDialogManager::RunBeforeUnloadDialog( WebContents* web_contents, - const base::string16& message_text, bool is_reload, const DialogClosedCallback& callback) { callback.Run(true, base::string16()); diff --git a/content/shell/browser/layout_test/layout_test_javascript_dialog_manager.h b/content/shell/browser/layout_test/layout_test_javascript_dialog_manager.h index 04ab714..726bdd2 100644 --- a/content/shell/browser/layout_test/layout_test_javascript_dialog_manager.h +++ b/content/shell/browser/layout_test/layout_test_javascript_dialog_manager.h @@ -29,7 +29,6 @@ class LayoutTestJavaScriptDialogManager : public ShellJavaScriptDialogManager { bool* did_suppress_message) override; void RunBeforeUnloadDialog(WebContents* web_contents, - const base::string16& message_text, bool is_reload, const DialogClosedCallback& callback) override; diff --git a/content/shell/browser/shell_javascript_dialog_manager.cc b/content/shell/browser/shell_javascript_dialog_manager.cc index a312e8d..fdd5725 100644 --- a/content/shell/browser/shell_javascript_dialog_manager.cc +++ b/content/shell/browser/shell_javascript_dialog_manager.cc @@ -66,7 +66,6 @@ void ShellJavaScriptDialogManager::RunJavaScriptDialog( void ShellJavaScriptDialogManager::RunBeforeUnloadDialog( WebContents* web_contents, - const base::string16& message_text, bool is_reload, const DialogClosedCallback& callback) { if (!dialog_request_callback_.is_null()) { @@ -83,16 +82,15 @@ void ShellJavaScriptDialogManager::RunBeforeUnloadDialog( return; } - base::string16 new_message_text = - message_text + - base::ASCIIToUTF16("\n\nIs it OK to leave/reload this page?"); + 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, - new_message_text, + message_text, base::string16(), // default callback)); #else diff --git a/content/shell/browser/shell_javascript_dialog_manager.h b/content/shell/browser/shell_javascript_dialog_manager.h index a7c29fb..4231104 100644 --- a/content/shell/browser/shell_javascript_dialog_manager.h +++ b/content/shell/browser/shell_javascript_dialog_manager.h @@ -32,7 +32,6 @@ class ShellJavaScriptDialogManager : public JavaScriptDialogManager { bool* did_suppress_message) override; void RunBeforeUnloadDialog(WebContents* web_contents, - const base::string16& message_text, bool is_reload, const DialogClosedCallback& callback) override; |