content/shell/browser/shell_javascript_dialog_manager.cc - Issue 1714573002: Remove the ability of webpages to specify strings for the onbeforeunload dialog.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1714573002: Remove the ability of webpages to specify strings for the onbeforeunload dialog. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase again Created 4 years, 9 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

« no previous file with comments | « content/shell/browser/shell_javascript_dialog_manager.h ('k') | extensions/browser/guest_view/web_view/javascript_dialog_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 a312e8dc39109cc3be368a1f02b9d48c32616718..fdd57253c5ac48338859c303bf901a1af60a0440 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