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

Side by Side Diff: athena/input/accelerator_manager_impl.h

Issue 623103002: replace OVERRIDE and FINAL with override and final in athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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/home/minimized_home.cc ('k') | athena/input/accelerator_manager_impl.cc » ('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 4
5 #ifndef ATHENA_INPUT_ACCELERATOR_MANAGER_H_ 5 #ifndef ATHENA_INPUT_ACCELERATOR_MANAGER_H_
6 #define ATHENA_INPUT_ACCELERATOR_MANAGER_H_ 6 #define ATHENA_INPUT_ACCELERATOR_MANAGER_H_
7 7
8 #include "athena/input/public/accelerator_manager.h" 8 #include "athena/input/public/accelerator_manager.h"
9 9
10 #include <map> 10 #include <map>
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 void Init(); 46 void Init();
47 47
48 void OnRootWindowCreated(aura::Window* root_window); 48 void OnRootWindowCreated(aura::Window* root_window);
49 49
50 bool Process(const ui::Accelerator& accelerator); 50 bool Process(const ui::Accelerator& accelerator);
51 51
52 // AcceleratorManager: 52 // AcceleratorManager:
53 // This is made public so that implementation classes can use this. 53 // This is made public so that implementation classes can use this.
54 virtual bool IsRegistered(const ui::Accelerator& accelerator, 54 virtual bool IsRegistered(const ui::Accelerator& accelerator,
55 int flags) const OVERRIDE; 55 int flags) const override;
56 56
57 private: 57 private:
58 class InternalData; 58 class InternalData;
59 59
60 explicit AcceleratorManagerImpl(AcceleratorWrapper* wrapper); 60 explicit AcceleratorManagerImpl(AcceleratorWrapper* wrapper);
61 61
62 // AcceleratorManager: 62 // AcceleratorManager:
63 virtual void RegisterAccelerators(const AcceleratorData accelerators[], 63 virtual void RegisterAccelerators(const AcceleratorData accelerators[],
64 size_t num_accelerators, 64 size_t num_accelerators,
65 AcceleratorHandler* handler) OVERRIDE; 65 AcceleratorHandler* handler) override;
66 virtual void SetDebugAcceleratorsEnabled(bool enabled) OVERRIDE; 66 virtual void SetDebugAcceleratorsEnabled(bool enabled) override;
67 67
68 // ui::AcceleratorTarget: 68 // ui::AcceleratorTarget:
69 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; 69 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
70 virtual bool CanHandleAccelerators() const OVERRIDE; 70 virtual bool CanHandleAccelerators() const override;
71 71
72 void RegisterAccelerator(const AcceleratorData& accelerator, 72 void RegisterAccelerator(const AcceleratorData& accelerator,
73 AcceleratorHandler* handler); 73 AcceleratorHandler* handler);
74 74
75 std::map<ui::Accelerator, InternalData> accelerators_; 75 std::map<ui::Accelerator, InternalData> accelerators_;
76 scoped_ptr<AcceleratorWrapper> accelerator_wrapper_; 76 scoped_ptr<AcceleratorWrapper> accelerator_wrapper_;
77 scoped_ptr<wm::AcceleratorFilter> accelerator_filter_; 77 scoped_ptr<wm::AcceleratorFilter> accelerator_filter_;
78 scoped_ptr<wm::NestedAcceleratorController> nested_accelerator_controller_; 78 scoped_ptr<wm::NestedAcceleratorController> nested_accelerator_controller_;
79 bool debug_accelerators_enabled_; 79 bool debug_accelerators_enabled_;
80 80
81 DISALLOW_COPY_AND_ASSIGN(AcceleratorManagerImpl); 81 DISALLOW_COPY_AND_ASSIGN(AcceleratorManagerImpl);
82 }; 82 };
83 83
84 } // namespace athena 84 } // namespace athena
85 85
86 #endif // ATHENA_INPUT_ACCELERATOR_MANAGER_H_ 86 #endif // ATHENA_INPUT_ACCELERATOR_MANAGER_H_
OLDNEW
« no previous file with comments | « athena/home/minimized_home.cc ('k') | athena/input/accelerator_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698