| Index: ash/accelerators/accelerator_controller.h
|
| diff --git a/ash/accelerators/accelerator_controller.h b/ash/accelerators/accelerator_controller.h
|
| index 9a7c579ac99df650045820ec1379b232fe3ebe41..04415617d5a3e6b8a2575668a3f5d9d0376b999b 100644
|
| --- a/ash/accelerators/accelerator_controller.h
|
| +++ b/ash/accelerators/accelerator_controller.h
|
| @@ -15,6 +15,7 @@
|
| #include "base/gtest_prod_util.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "ui/base/accelerators/accelerator.h"
|
| +#include "ui/base/accelerators/accelerator_history.h"
|
|
|
| namespace ui {
|
| class AcceleratorManager;
|
| @@ -117,10 +118,6 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
|
| return &exit_warning_handler_;
|
| }
|
|
|
| - const ui::Accelerator& previous_accelerator_for_test() const {
|
| - return previous_accelerator_;
|
| - }
|
| -
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(AcceleratorControllerTest, GlobalAccelerators);
|
| FRIEND_TEST_ALL_PREFIXES(AcceleratorControllerTest,
|
| @@ -152,10 +149,6 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
|
| keyboard_brightness_control_delegate_;
|
| scoped_ptr<ScreenshotDelegate> screenshot_delegate_;
|
|
|
| - // Remember previous accelerator as some accelerator needs to be fired
|
| - // with a specific sequence.
|
| - ui::Accelerator previous_accelerator_;
|
| -
|
| // Handles the exit accelerator which requires a double press to exit and
|
| // shows a popup with an explanation.
|
| ExitWarningHandler exit_warning_handler_;
|
|
|