| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "athena/input/public/accelerator_manager.h" | 5 #include "athena/input/public/accelerator_manager.h" |
| 6 | 6 |
| 7 #include "athena/input/public/input_manager.h" | 7 #include "athena/input/public/input_manager.h" |
| 8 #include "athena/test/base/athena_test_base.h" | 8 #include "athena/test/base/athena_test_base.h" |
| 9 #include "ui/events/test/event_generator.h" | 9 #include "ui/events/test/event_generator.h" |
| 10 | 10 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 void set_enabled(bool enabled) { enabled_ = enabled; } | 21 void set_enabled(bool enabled) { enabled_ = enabled; } |
| 22 | 22 |
| 23 int GetFiredCommandIdAndReset() { | 23 int GetFiredCommandIdAndReset() { |
| 24 int fired = fired_command_id_; | 24 int fired = fired_command_id_; |
| 25 fired_command_id_ = kInvalidCommandId; | 25 fired_command_id_ = kInvalidCommandId; |
| 26 return fired; | 26 return fired; |
| 27 } | 27 } |
| 28 | 28 |
| 29 private: | 29 private: |
| 30 // AcceleratorHandler: | 30 // AcceleratorHandler: |
| 31 virtual bool IsCommandEnabled(int command_id) const OVERRIDE { | 31 virtual bool IsCommandEnabled(int command_id) const override { |
| 32 return enabled_; | 32 return enabled_; |
| 33 } | 33 } |
| 34 virtual bool OnAcceleratorFired(int command_id, | 34 virtual bool OnAcceleratorFired(int command_id, |
| 35 const ui::Accelerator& accelerator) OVERRIDE { | 35 const ui::Accelerator& accelerator) override { |
| 36 fired_command_id_ = command_id; | 36 fired_command_id_ = command_id; |
| 37 return true; | 37 return true; |
| 38 } | 38 } |
| 39 | 39 |
| 40 int fired_command_id_; | 40 int fired_command_id_; |
| 41 bool enabled_; | 41 bool enabled_; |
| 42 | 42 |
| 43 DISALLOW_COPY_AND_ASSIGN(TestHandler); | 43 DISALLOW_COPY_AND_ASSIGN(TestHandler); |
| 44 }; | 44 }; |
| 45 | 45 |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 generator.PressKey(ui::VKEY_D, ui::EF_SHIFT_DOWN | ui::EF_IS_REPEAT); | 110 generator.PressKey(ui::VKEY_D, ui::EF_SHIFT_DOWN | ui::EF_IS_REPEAT); |
| 111 EXPECT_EQ(kInvalidCommandId, test_handler.GetFiredCommandIdAndReset()); | 111 EXPECT_EQ(kInvalidCommandId, test_handler.GetFiredCommandIdAndReset()); |
| 112 | 112 |
| 113 // TODO(oshima): Add scenario where the key event is consumed by | 113 // TODO(oshima): Add scenario where the key event is consumed by |
| 114 // an app. | 114 // an app. |
| 115 generator.PressKey(ui::VKEY_E, ui::EF_SHIFT_DOWN); | 115 generator.PressKey(ui::VKEY_E, ui::EF_SHIFT_DOWN); |
| 116 EXPECT_EQ(COMMAND_E, test_handler.GetFiredCommandIdAndReset()); | 116 EXPECT_EQ(COMMAND_E, test_handler.GetFiredCommandIdAndReset()); |
| 117 } | 117 } |
| 118 | 118 |
| 119 } // namespace athena | 119 } // namespace athena |
| OLD | NEW |