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

Side by Side Diff: athena/screen/screen_accelerator_handler.h

Issue 641683003: C++11 override style change for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase 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 unified diff | Download patch
« no previous file with comments | « athena/screen/modal_window_controller.h ('k') | athena/screen/screen_manager_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_ 4 #ifndef ATHENA_SCREEN_SCREEN_ACCELERATOR_HANDLER_H_
5 #define ATHENA_SCREEN_SCREEN_ACCELERATOR_HANDLER_H_ 5 #define ATHENA_SCREEN_SCREEN_ACCELERATOR_HANDLER_H_
6 6
7 #include "athena/input/public/accelerator_manager.h" 7 #include "athena/input/public/accelerator_manager.h"
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 10
11 namespace aura { 11 namespace aura {
12 class Window; 12 class Window;
13 } 13 }
14 14
15 namespace athena { 15 namespace athena {
16 16
17 // Handles screen related accelerators. 17 // Handles screen related accelerators.
18 class ScreenAcceleratorHandler : public AcceleratorHandler { 18 class ScreenAcceleratorHandler : public AcceleratorHandler {
19 public: 19 public:
20 explicit ScreenAcceleratorHandler(aura::Window* root_window); 20 explicit ScreenAcceleratorHandler(aura::Window* root_window);
21 21
22 private: 22 private:
23 virtual ~ScreenAcceleratorHandler(); 23 ~ScreenAcceleratorHandler() override;
24 24
25 // AcceleratorHandler: 25 // AcceleratorHandler:
26 virtual bool IsCommandEnabled(int command_id) const override; 26 virtual bool IsCommandEnabled(int command_id) const override;
27 virtual bool OnAcceleratorFired(int command_id, 27 virtual bool OnAcceleratorFired(int command_id,
28 const ui::Accelerator& accelerator) override; 28 const ui::Accelerator& accelerator) override;
29 29
30 aura::Window* root_window_; 30 aura::Window* root_window_;
31 31
32 DISALLOW_COPY_AND_ASSIGN(ScreenAcceleratorHandler); 32 DISALLOW_COPY_AND_ASSIGN(ScreenAcceleratorHandler);
33 }; 33 };
34 34
35 } // namespace athena 35 } // namespace athena
36 36
37 #endif // ATHENA_SCREEN_SCREEN_ACCELERATOR_HANDLER_H_ 37 #endif // ATHENA_SCREEN_SCREEN_ACCELERATOR_HANDLER_H_
OLDNEW
« no previous file with comments | « athena/screen/modal_window_controller.h ('k') | athena/screen/screen_manager_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698