| Index: ash/accelerators/nested_accelerator_delegate.h
|
| diff --git a/ash/accelerators/nested_accelerator_delegate.h b/ash/accelerators/nested_accelerator_delegate.h
|
| index 63bc4985ceab329083b92e076ac965dbf4cfde6a..1a128512a91e1034b960c43cc71ce563ba36004d 100644
|
| --- a/ash/accelerators/nested_accelerator_delegate.h
|
| +++ b/ash/accelerators/nested_accelerator_delegate.h
|
| @@ -16,8 +16,8 @@ class NestedAcceleratorDelegate : public wm::NestedAcceleratorDelegate {
|
| virtual ~NestedAcceleratorDelegate();
|
|
|
| // wm::AcceleratorDispatcher::Delegate
|
| - virtual bool ShouldProcessEventNow(const ui::KeyEvent& key_event) OVERRIDE;
|
| - virtual bool ProcessEvent(const ui::KeyEvent& key_event) OVERRIDE;
|
| + virtual Result ProcessAccelerator(
|
| + const ui::Accelerator& accelerator) OVERRIDE;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(NestedAcceleratorDelegate);
|
|
|