Chromium Code Reviews| Index: chrome/browser/ui/views/keyboard_overlay_dialog_view.cc |
| diff --git a/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc b/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc |
| index db2149c90667504d862c9ff35887e3ce9eb34bbf..6b1c1c972649b7028dbf11da750e456852f6471a 100644 |
| --- a/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc |
| +++ b/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc |
| @@ -15,6 +15,10 @@ |
| #include "ui/views/widget/widget.h" |
| #include "ui/web_dialogs/web_dialog_delegate.h" |
| +#if defined(OS_CHROMEOS) |
| +#include "chrome/browser/chromeos/input_method/input_method_manager.h" |
| +#endif |
| + |
| using ui::WebDialogDelegate; |
| namespace { |
| @@ -36,6 +40,9 @@ void KeyboardOverlayDialogView::ShowDialog() { |
| if (g_instance) |
| return; |
| +#if defined(OS_CHROMEOS) |
|
sky
2012/06/12 04:23:24
Add a comment here and in WindowClosing as to why
Yusuke Sato
2012/06/12 05:12:03
Done.
|
| + chromeos::input_method::InputMethodManager::GetInstance()->DisableHotkeys(); |
| +#endif |
| KeyboardOverlayDelegate* delegate = new KeyboardOverlayDelegate( |
| l10n_util::GetStringUTF16(IDS_KEYBOARD_OVERLAY_TITLE)); |
| KeyboardOverlayDialogView* view = new KeyboardOverlayDialogView( |
| @@ -64,5 +71,8 @@ void KeyboardOverlayDialogView::ShowDialog() { |
| } |
| void KeyboardOverlayDialogView::WindowClosing() { |
| +#if defined(OS_CHROMEOS) |
| + chromeos::input_method::InputMethodManager::GetInstance()->EnableHotkeys(); |
| +#endif |
| g_instance = NULL; |
| } |