ESC accelerator and consistent overview mode for Athena homecard

athena/input/accelerator_manager_impl.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ATHENA_INPUT_ACCELERATOR_MANAGER_H_
 #define ATHENA_INPUT_ACCELERATOR_MANAGER_H_
 
 #include "athena/input/public/accelerator_manager.h"
 
 #include <map>
@@ skipping 51 matching lines @@
   // AcceleratorManager:
   virtual void RegisterAccelerators(const AcceleratorData accelerators[],
                                     size_t num_accelerators,
                                     AcceleratorHandler* handler) OVERRIDE;
   virtual void SetDebugAcceleratorsEnabled(bool enabled) OVERRIDE;
 
   // ui::AcceleratorTarget:
   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;

[oshima, 2014/09/25 21:39:43]

can you run "git cl format" ?

[Greg Levin, 2014/10/02 21:56:09]

Done, and thanks for the advice!

+  virtual void UnregisterAccelerator(const AcceleratorData& accelerator_data,
+                             AcceleratorHandler* handler) OVERRIDE;
 
   std::map<ui::Accelerator, InternalData> accelerators_;
   scoped_ptr<AcceleratorWrapper> accelerator_wrapper_;
   scoped_ptr<wm::AcceleratorFilter> accelerator_filter_;
   scoped_ptr<wm::NestedAcceleratorController> nested_accelerator_controller_;
   bool debug_accelerators_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratorManagerImpl);
 };
 
 }  // namespace athena
 
 #endif  // ATHENA_INPUT_ACCELERATOR_MANAGER_H_