summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-14 16:48:30 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-14 16:48:30 +0000
commit591a5b7874d9ec8feccdaa75a1caf9f5462b6168 (patch)
tree7ae051ae8319ffed45d019973b83048941656650
parentf5fbde808a01eccb1dc74642c8cc041cf2af6d02 (diff)
downloadchromium_src-591a5b7874d9ec8feccdaa75a1caf9f5462b6168.zip
chromium_src-591a5b7874d9ec8feccdaa75a1caf9f5462b6168.tar.gz
chromium_src-591a5b7874d9ec8feccdaa75a1caf9f5462b6168.tar.bz2
Merge 92443 - CrOS - Fix escape key not closing file picker
The file picker ExtensionDialog was not properly taking keyboard focus when it opened, which resulted in keystrokes being ignored until the user either clicked in the dialog or pressed tab. BUG=chromium-os:17189 TEST=manual Review URL: http://codereview.chromium.org/7360004 TBR=jamescook@chromium.org Review URL: http://codereview.chromium.org/7371011 git-svn-id: svn://svn.chromium.org/chrome/branches/782/src@92558 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/views/extensions/extension_dialog.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/ui/views/extensions/extension_dialog.cc b/chrome/browser/ui/views/extensions/extension_dialog.cc
index f1ce02b..832b7f1 100644
--- a/chrome/browser/ui/views/extensions/extension_dialog.cc
+++ b/chrome/browser/ui/views/extensions/extension_dialog.cc
@@ -41,6 +41,9 @@ ExtensionDialog::ExtensionDialog(Browser* browser, ExtensionHost* host,
Source<Profile>(host->profile()));
window_->Show();
+ window_->Activate();
+ // Ensure the DOM JavaScript can respond immediately to keyboard shortcuts.
+ host->render_view_host()->view()->Focus();
}
ExtensionDialog::~ExtensionDialog() {