| Index: views/focus/focus_manager_unittest.cc
|
| diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc
|
| index b2497e369e94e842a6672db2e9ca23ee0b8e8cab..2d2e18b2a17d56e575fba5a2d49ed5f81365420e 100644
|
| --- a/views/focus/focus_manager_unittest.cc
|
| +++ b/views/focus/focus_manager_unittest.cc
|
| @@ -1294,7 +1294,7 @@ class TestAcceleratorTarget : public AcceleratorTarget {
|
| explicit TestAcceleratorTarget(bool process_accelerator)
|
| : accelerator_count_(0), process_accelerator_(process_accelerator) {}
|
|
|
| - virtual bool AcceleratorPressed(const Accelerator& accelerator) {
|
| + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) {
|
| ++accelerator_count_;
|
| return process_accelerator_;
|
| }
|
| @@ -1401,7 +1401,7 @@ TEST_F(FocusManagerTest, CallsNormalAcceleratorTarget) {
|
| }
|
|
|
| // Unregisters itself when its accelerator is invoked.
|
| -class SelfUnregisteringAcceleratorTarget : public AcceleratorTarget {
|
| +class SelfUnregisteringAcceleratorTarget : public ui::AcceleratorTarget {
|
| public:
|
| SelfUnregisteringAcceleratorTarget(Accelerator accelerator,
|
| FocusManager* focus_manager)
|
| @@ -1410,7 +1410,7 @@ class SelfUnregisteringAcceleratorTarget : public AcceleratorTarget {
|
| accelerator_count_(0) {
|
| }
|
|
|
| - virtual bool AcceleratorPressed(const Accelerator& accelerator) {
|
| + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) {
|
| ++accelerator_count_;
|
| focus_manager_->UnregisterAccelerator(accelerator, this);
|
| return true;
|
|
|