| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h" | 5 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h" |
| 6 | 6 |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "chrome/browser/chromeos/input_method/input_method_manager.h" | 8 #include "chrome/browser/chromeos/input_method/input_method_manager.h" |
| 9 #include "chrome/browser/profiles/profile_manager.h" | 9 #include "chrome/browser/profiles/profile_manager.h" |
| 10 #include "chrome/browser/ui/browser_dialogs.h" | 10 #include "chrome/browser/ui/browser_dialogs.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 target_(target) { | 39 target_(target) { |
| 40 RegisterDialogAccelerators(); | 40 RegisterDialogAccelerators(); |
| 41 } | 41 } |
| 42 | 42 |
| 43 KeyboardOverlayDialogView::~KeyboardOverlayDialogView() { | 43 KeyboardOverlayDialogView::~KeyboardOverlayDialogView() { |
| 44 } | 44 } |
| 45 | 45 |
| 46 void KeyboardOverlayDialogView::RegisterDialogAccelerators() { | 46 void KeyboardOverlayDialogView::RegisterDialogAccelerators() { |
| 47 for (size_t i = 0; i < arraysize(kCloseAccelerators); ++i) { | 47 for (size_t i = 0; i < arraysize(kCloseAccelerators); ++i) { |
| 48 ui::Accelerator accelerator(kCloseAccelerators[i].keycode, | 48 ui::Accelerator accelerator(kCloseAccelerators[i].keycode, |
| 49 kCloseAccelerators[i].modifiers); | 49 kCloseAccelerators[i].modifiers, |
| 50 ui::ET_KEY_PRESSED); |
| 50 close_accelerators_.insert(accelerator); | 51 close_accelerators_.insert(accelerator); |
| 51 AddAccelerator(accelerator); | 52 AddAccelerator(accelerator); |
| 52 } | 53 } |
| 53 | 54 |
| 54 for (size_t i = 0; i < browser::kAcceleratorMapLength; ++i) { | 55 for (size_t i = 0; i < browser::kAcceleratorMapLength; ++i) { |
| 55 ui::Accelerator accelerator(browser::kAcceleratorMap[i].keycode, | 56 ui::Accelerator accelerator(browser::kAcceleratorMap[i].keycode, |
| 56 browser::kAcceleratorMap[i].modifiers); | 57 browser::kAcceleratorMap[i].modifiers, |
| 58 ui::ET_KEY_PRESSED); |
| 57 // Skip a sole ALT key since it's handled on the keyboard overlay. | 59 // Skip a sole ALT key since it's handled on the keyboard overlay. |
| 58 if (ui::Accelerator(ui::VKEY_MENU, ui::EF_NONE) == accelerator) { | 60 if (ui::Accelerator(ui::VKEY_MENU, ui::EF_NONE, ui::ET_KEY_PRESSED) |
| 61 == accelerator) { |
| 59 continue; | 62 continue; |
| 60 } | 63 } |
| 61 // Skip accelerators for closing the dialog since they are already added. | 64 // Skip accelerators for closing the dialog since they are already added. |
| 62 if (IsCloseAccelerator(accelerator)) { | 65 if (IsCloseAccelerator(accelerator)) { |
| 63 continue; | 66 continue; |
| 64 } | 67 } |
| 65 AddAccelerator(accelerator); | 68 AddAccelerator(accelerator); |
| 66 } | 69 } |
| 67 } | 70 } |
| 68 | 71 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 size.width(), | 103 size.width(), |
| 101 size.height()); | 104 size.height()); |
| 102 view->GetWidget()->SetBounds(bounds); | 105 view->GetWidget()->SetBounds(bounds); |
| 103 view->GetWidget()->Show(); | 106 view->GetWidget()->Show(); |
| 104 } | 107 } |
| 105 | 108 |
| 106 bool KeyboardOverlayDialogView::IsCloseAccelerator( | 109 bool KeyboardOverlayDialogView::IsCloseAccelerator( |
| 107 const ui::Accelerator& accelerator) { | 110 const ui::Accelerator& accelerator) { |
| 108 return close_accelerators_.find(accelerator) != close_accelerators_.end(); | 111 return close_accelerators_.find(accelerator) != close_accelerators_.end(); |
| 109 } | 112 } |
| OLD | NEW |