diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-27 21:29:29 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-27 21:29:29 +0000 |
| commit | be6d2fef9010d0d2bd3635db9268d567aad71e05 (patch) | |
| tree | 02fc2a01e98099b400567c89b6f2917c455c3331 /chrome | |
| parent | 9fadfcb99f3399f07afaaeb60b922d36fa160694 (diff) | |
| download | chromium_src-be6d2fef9010d0d2bd3635db9268d567aad71e05.zip chromium_src-be6d2fef9010d0d2bd3635db9268d567aad71e05.tar.gz chromium_src-be6d2fef9010d0d2bd3635db9268d567aad71e05.tar.bz2 | |
Explicitly tag the "cancel" button as being triggered by escape.
BUG=http://crbug.com/42321
TEST=as in bug
Review URL: http://codereview.chromium.org/1758012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/js_modal_dialog_mac.mm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/js_modal_dialog_mac.mm b/chrome/browser/js_modal_dialog_mac.mm index d15e6ad..bd17112 100644 --- a/chrome/browser/js_modal_dialog_mac.mm +++ b/chrome/browser/js_modal_dialog_mac.mm @@ -139,8 +139,10 @@ void JavaScriptAppModalDialog::CreateAndShowDialog() { [alert setInformativeText:base::SysWideToNSString(message_text_)]; [alert setMessageText:base::SysWideToNSString(title_)]; [alert addButtonWithTitle:default_button]; - if (!one_button) - [alert addButtonWithTitle:other_button]; + if (!one_button) { + NSButton* other = [alert addButtonWithTitle:other_button]; + [other setKeyEquivalent:@"\e"]; + } if (display_suppress_checkbox_) { [alert setShowsSuppressionButton:YES]; NSString* suppression_title = l10n_util::GetNSStringWithFixup( |