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

Side by Side Diff: ui/wm/core/accelerator_filter.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (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 | « ui/web_dialogs/web_dialog_web_contents_delegate.h ('k') | ui/wm/core/base_focus_rules.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 4
5 #ifndef UI_WM_CORE_ACCELERATOR_FILTER_H_ 5 #ifndef UI_WM_CORE_ACCELERATOR_FILTER_H_
6 #define UI_WM_CORE_ACCELERATOR_FILTER_H_ 6 #define UI_WM_CORE_ACCELERATOR_FILTER_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "ui/events/event_handler.h" 10 #include "ui/events/event_handler.h"
11 #include "ui/wm/wm_export.h" 11 #include "ui/wm/wm_export.h"
12 12
13 namespace ui { 13 namespace ui {
14 class Accelerator; 14 class Accelerator;
15 } 15 }
16 16
17 namespace wm { 17 namespace wm {
18 class AcceleratorDelegate; 18 class AcceleratorDelegate;
19 19
20 // AcceleratorFilter filters key events for AcceleratorControler handling global 20 // AcceleratorFilter filters key events for AcceleratorControler handling global
21 // keyboard accelerators. 21 // keyboard accelerators.
22 class WM_EXPORT AcceleratorFilter : public ui::EventHandler { 22 class WM_EXPORT AcceleratorFilter : public ui::EventHandler {
23 public: 23 public:
24 AcceleratorFilter(scoped_ptr<AcceleratorDelegate> delegate); 24 AcceleratorFilter(scoped_ptr<AcceleratorDelegate> delegate);
25 virtual ~AcceleratorFilter(); 25 virtual ~AcceleratorFilter();
26 26
27 // Overridden from ui::EventHandler: 27 // Overridden from ui::EventHandler:
28 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 28 virtual void OnKeyEvent(ui::KeyEvent* event) override;
29 29
30 private: 30 private:
31 scoped_ptr<AcceleratorDelegate> delegate_; 31 scoped_ptr<AcceleratorDelegate> delegate_;
32 32
33 DISALLOW_COPY_AND_ASSIGN(AcceleratorFilter); 33 DISALLOW_COPY_AND_ASSIGN(AcceleratorFilter);
34 }; 34 };
35 35
36 ui::Accelerator CreateAcceleratorFromKeyEvent(const ui::KeyEvent& key_event); 36 ui::Accelerator CreateAcceleratorFromKeyEvent(const ui::KeyEvent& key_event);
37 37
38 } // namespace wm 38 } // namespace wm
39 39
40 #endif // UI_WM_CORE_ACCELERATOR_FILTER_H_ 40 #endif // UI_WM_CORE_ACCELERATOR_FILTER_H_
OLDNEW
« no previous file with comments | « ui/web_dialogs/web_dialog_web_contents_delegate.h ('k') | ui/wm/core/base_focus_rules.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698