ui/views/window/dialog_client_view.cc - Issue 10965052: Provide hook to abort dialog cancellation, disable cancellation during install.

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: ui/views/window/dialog_client_view.cc

Issue 10965052: Provide hook to abort dialog cancellation, disable cancellation during install. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Combined if clauses. Created 8 years, 3 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: ui/views/window/dialog_client_view.cc

diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc

index 1c289d3140ebfe7f36a03f6d80ab0430bd09d386..3401fbda2c5a5a0f67286cd7ebf8a22ee2811d1d 100644

--- a/ui/views/window/dialog_client_view.cc

+++ b/ui/views/window/dialog_client_view.cc

@@ -259,7 +259,8 @@ bool DialogClientView::CanClose() {

DialogDelegate* dd = GetDialogDelegate();

int buttons = dd->GetDialogButtons();

bool close = true;

- if (buttons & ui::DIALOG_BUTTON_CANCEL)

+ if ((buttons & ui::DIALOG_BUTTON_CANCEL) ||

+ (buttons == ui::DIALOG_BUTTON_NONE))

close = dd->Cancel();

else if (buttons & ui::DIALOG_BUTTON_OK)

close = dd->Accept(true);

« no previous file with comments | « chrome/browser/ui/views/web_intent_picker_views.cc ('k') | ui/views/window/dialog_delegate.h » ('j') | no next file with comments »