| OLD | NEW | 
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
|  | 4 #ifndef ATHENA_SCREEN_SCREEN_ACCELERATOR_HANDLER_H_ | 
|  | 5 #define ATHENA_SCREEN_SCREEN_ACCELERATOR_HANDLER_H_ | 
| 4 | 6 | 
| 5 #include "athena/input/public/accelerator_manager.h" | 7 #include "athena/input/public/accelerator_manager.h" | 
| 6 | 8 | 
| 7 #include "base/macros.h" | 9 #include "base/macros.h" | 
| 8 | 10 | 
| 9 namespace aura { | 11 namespace aura { | 
| 10 class Window; | 12 class Window; | 
| 11 } | 13 } | 
| 12 | 14 | 
| 13 namespace athena { | 15 namespace athena { | 
| (...skipping 10 matching lines...) Expand all  Loading... | 
| 24   virtual bool IsCommandEnabled(int command_id) const override; | 26   virtual bool IsCommandEnabled(int command_id) const override; | 
| 25   virtual bool OnAcceleratorFired(int command_id, | 27   virtual bool OnAcceleratorFired(int command_id, | 
| 26                                   const ui::Accelerator& accelerator) override; | 28                                   const ui::Accelerator& accelerator) override; | 
| 27 | 29 | 
| 28   aura::Window* root_window_; | 30   aura::Window* root_window_; | 
| 29 | 31 | 
| 30   DISALLOW_COPY_AND_ASSIGN(ScreenAcceleratorHandler); | 32   DISALLOW_COPY_AND_ASSIGN(ScreenAcceleratorHandler); | 
| 31 }; | 33 }; | 
| 32 | 34 | 
| 33 }  // namespace athena | 35 }  // namespace athena | 
|  | 36 | 
|  | 37 #endif  // ATHENA_SCREEN_SCREEN_ACCELERATOR_HANDLER_H_ | 
| OLD | NEW | 
|---|