content/shell/browser/shell_javascript_dialog_manager.h - Issue 1825523002: Do not reset navigation state when BeforeUnload is cancelled by a commit

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.h

Issue 1825523002: Do not reset navigation state when BeforeUnload is cancelled by a commit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase + addressed nit 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/browser/web_contents/web_contents_impl_browsertest.cc ('k') | content/shell/browser/shell_javascript_dialog_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/browser/shell_javascript_dialog_manager.h

diff --git a/content/shell/browser/shell_javascript_dialog_manager.h b/content/shell/browser/shell_javascript_dialog_manager.h

index 42311042374f6ec14fadc8ee523650c5096a201f..9dee3a22b0e7bffb914c3283de10050c8ec8ae23 100644

--- a/content/shell/browser/shell_javascript_dialog_manager.h

+++ b/content/shell/browser/shell_javascript_dialog_manager.h

@@ -46,6 +46,9 @@ class ShellJavaScriptDialogManager : public JavaScriptDialogManager {

void set_dialog_request_callback(const base::Closure& callback) {

dialog_request_callback_ = callback;

}

+ void set_should_proceed_on_beforeunload(bool proceed) {

+ should_proceed_on_beforeunload_ = proceed;

+ }

private:

#if defined(OS_MACOSX) || defined(OS_WIN)

@@ -57,6 +60,12 @@ class ShellJavaScriptDialogManager : public JavaScriptDialogManager {

base::Closure dialog_request_callback_;

+ // Whether to automatically proceed when asked to display a BeforeUnload

+ // dialog.

+ bool should_proceed_on_beforeunload_;

+ DialogClosedCallback before_unload_callback_;

DISALLOW_COPY_AND_ASSIGN(ShellJavaScriptDialogManager);

};