ESC accelerator and consistent overview mode for Athena homecard

athena/input/accelerator_manager_impl.h

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..75209516521f64fcab1a75893564b7bbc879312f 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_;