Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(103)

Unified Diff: athena/input/accelerator_manager_impl.h

Issue 601333002: ESC accelerator and consistent overview mode for Athena homecard (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge with refactoring CL Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: athena/input/accelerator_manager_impl.h
diff --git a/athena/input/accelerator_manager_impl.h b/athena/input/accelerator_manager_impl.h
index f7684e2de8fc8b58bfbfd75c7441cd156da115c5..282fa8cd1480e55faa60a021e62f27119382f6dc 100644
--- a/athena/input/accelerator_manager_impl.h
+++ b/athena/input/accelerator_manager_impl.h
@@ -69,8 +69,10 @@ class AcceleratorManagerImpl : public AcceleratorManager,
virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
virtual bool CanHandleAccelerators() const override;
- void RegisterAccelerator(const AcceleratorData& accelerator,
- AcceleratorHandler* handler);
+ virtual void RegisterAccelerator(const AcceleratorData& accelerator_data,
+ AcceleratorHandler* handler) override;
+ virtual void UnregisterAccelerator(const AcceleratorData& accelerator_data,
+ AcceleratorHandler* handler) override;
std::map<ui::Accelerator, InternalData> accelerators_;
scoped_ptr<AcceleratorWrapper> accelerator_wrapper_;

Powered by Google App Engine
This is Rietveld 408576698