| Index: ui/base/accelerators/accelerator_manager.cc
|
| diff --git a/ui/base/accelerators/accelerator_manager.cc b/ui/base/accelerators/accelerator_manager.cc
|
| index 4ab14b5fc15595789979a48f78fc7581dbd2563b..655ac3903ab8032cb36c225f80cf2e5870f7ed3a 100644
|
| --- a/ui/base/accelerators/accelerator_manager.cc
|
| +++ b/ui/base/accelerators/accelerator_manager.cc
|
| @@ -10,7 +10,7 @@
|
|
|
| namespace ui {
|
|
|
| -AcceleratorManager::AcceleratorManager() : last_event_type_(ET_KEY_PRESSED) {
|
| +AcceleratorManager::AcceleratorManager() {
|
| }
|
|
|
| AcceleratorManager::~AcceleratorManager() {
|
| @@ -91,7 +91,7 @@ bool AcceleratorManager::Process(const Accelerator& accelerator) {
|
| }
|
| }
|
| }
|
| - last_event_type_ = accelerator.type();
|
| + set_last_event(accelerator);
|
| return result;
|
| }
|
|
|
| @@ -125,7 +125,7 @@ bool AcceleratorManager::ShouldHandle(const Accelerator& accelerator) const {
|
| // This check is necessary e.g. not to process the Shift+Alt+ET_KEY_RELEASED
|
| // Accelerator for Chrome OS (see ash/accelerators/accelerator_controller.cc)
|
| // when Shift+Alt+Tab is pressed and then Tab is released.
|
| - return last_event_type_ == ET_KEY_PRESSED;
|
| + return last_event_.type() == ET_KEY_PRESSED;
|
| }
|
|
|
| } // namespace ui
|
|
|