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 45 matching lines @@
 
  private:
   class InternalData;
 
   explicit AcceleratorManagerImpl(AcceleratorWrapper* wrapper);
 
   // AcceleratorManager:
   virtual void RegisterAccelerators(const AcceleratorData accelerators[],
                                     size_t num_accelerators,
                                     AcceleratorHandler* handler) override;
   virtual void SetDebugAcceleratorsEnabled(bool enabled) override;

[pkotwicz, 2014/10/15 17:00:33]

Nit: Group all of the accelerators which AcceleratorManager overrides together.
(My preference is in the same order as defined in AcceleratorManager too)

[Greg Levin, 2014/10/15 20:56:13]

Done.

 
   // 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;
+  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_