diff options
| author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 00:57:46 +0000 |
|---|---|---|
| committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 00:57:46 +0000 |
| commit | d140fd77ba6a08111d2b7c1be59f0073b9dbe1fd (patch) | |
| tree | fe6ebc4a024ee9f6cff16a61d01993e8c5d44e4a | |
| parent | 485a527c0e171dab7d4e2b58181bd395c665978e (diff) | |
| download | chromium_src-d140fd77ba6a08111d2b7c1be59f0073b9dbe1fd.zip chromium_src-d140fd77ba6a08111d2b7c1be59f0073b9dbe1fd.tar.gz chromium_src-d140fd77ba6a08111d2b7c1be59f0073b9dbe1fd.tar.bz2 | |
Close the keyboard overlay with Ctrl+Alt+/.
BUG=chromium-os:12920
TEST=manually on the chrome notebook
Review URL: http://codereview.chromium.org/6824033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81197 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/generated_resources.grd | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/views/html_dialog_view.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/ui/views/keyboard_overlay_delegate.cc | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index f113de8..a3a1bb8 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -11222,7 +11222,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Hold Control, Alt, or Shift to see keyboard<br>shortcuts for those modifiers. </message> <message name="IDS_KEYBOARD_OVERLAY_INSTRUCTIONS_HIDE" desc="The instruction for hiding the keyboard overlay."> - Hit esc to hide + Type Ctrl+Alt+/ or Escape to hide </message> <message name="IDS_KEYBOARD_OVERLAY_ACTIVATE_LAST_TAB" desc="The text in the keyboard overlay to explain the shortcut."> Activate last tab diff --git a/chrome/browser/ui/views/html_dialog_view.cc b/chrome/browser/ui/views/html_dialog_view.cc index 3887b6d..b922217 100644 --- a/chrome/browser/ui/views/html_dialog_view.cc +++ b/chrome/browser/ui/views/html_dialog_view.cc @@ -59,8 +59,9 @@ gfx::Size HtmlDialogView::GetPreferredSize() { } bool HtmlDialogView::AcceleratorPressed(const views::Accelerator& accelerator) { - // Pressing ESC closes the dialog. - DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.GetKeyCode()); + // Pressing Esc, Ctrl+Alt+/, or Ctrl+Alt+? closes the keyboard overlay. + DCHECK(ui::VKEY_ESCAPE == accelerator.GetKeyCode() || + ui::VKEY_OEM_2 == accelerator.GetKeyCode()); OnDialogClosed(std::string()); return true; } diff --git a/chrome/browser/ui/views/keyboard_overlay_delegate.cc b/chrome/browser/ui/views/keyboard_overlay_delegate.cc index 4848f04..930c9f4 100644 --- a/chrome/browser/ui/views/keyboard_overlay_delegate.cc +++ b/chrome/browser/ui/views/keyboard_overlay_delegate.cc @@ -22,6 +22,11 @@ void KeyboardOverlayDelegate::ShowDialog(gfx::NativeWindow owning_window) { HtmlDialogView* html_view = new HtmlDialogView(browser->profile(), delegate); html_view->InitDialog(); + html_view->AddAccelerator( + views::Accelerator(ui::VKEY_OEM_2, false, true, true)); + html_view->AddAccelerator( + views::Accelerator(ui::VKEY_OEM_2, true, true, true)); + chromeos::BubbleWindow::Create(owning_window, gfx::Rect(), chromeos::BubbleWindow::STYLE_XSHAPE, |