summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-07 21:42:55 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-07 21:42:55 +0000
commitae97030793d282ecef7579c1726f8a36825a438f (patch)
tree60bc6307bebe92ce7338ca33fb967cf2fcbadab1 /chrome/browser/cocoa
parentc2feb6cc0f22d5b2818beed29dad4c90afcedde6 (diff)
downloadchromium_src-ae97030793d282ecef7579c1726f8a36825a438f.zip
chromium_src-ae97030793d282ecef7579c1726f8a36825a438f.tar.gz
chromium_src-ae97030793d282ecef7579c1726f8a36825a438f.tar.bz2
Make JavaScript alert and confirm dialog boxes driveable by keyboard.
This regressed in r60785. An error during refactoring used -[JavaScriptAppModalDialogHelper textField] to determine whether an accessory view was added to a JavaScript dialog box, but this isn't a simple getter, and was allays returning true. BUG=58299 TEST=- javascript:alert("x") allows return keypress to dismiss dialog (OK); if FKA is on, allows space bar operation - javascript:confirm("x") allows return keypress to dismiss dialog (OK); if FKA is on, has focus on Cancel, is tabbable between Cancel and OK, and allows space bar operation; - javascript:prompt("x") focuses text field and allows return keypress to dismiss dialog (OK); if FKA is on, is tabbable between text field and buttons, and allows space bar operation on buttons - Note: FKA is Full Keyboard Access, from System Preferences:Keyboard Review URL: http://codereview.chromium.org/3555021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61847 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/js_modal_dialog_cocoa.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/js_modal_dialog_cocoa.mm b/chrome/browser/cocoa/js_modal_dialog_cocoa.mm
index ced3af1..3df9e65 100644
--- a/chrome/browser/cocoa/js_modal_dialog_cocoa.mm
+++ b/chrome/browser/cocoa/js_modal_dialog_cocoa.mm
@@ -183,8 +183,8 @@ void JSModalDialogCocoa::ShowAppModalDialog() {
didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:)
contextInfo:this];
- if ([helper_ textField])
- [[alert_ window] makeFirstResponder:[helper_ textField]];
+ if ([alert_ accessoryView])
+ [[alert_ window] makeFirstResponder:[alert_ accessoryView]];
}
void JSModalDialogCocoa::ActivateAppModalDialog() {