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

Side by Side Diff: ash/accelerators/focus_manager_factory.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « ash/accelerators/exit_warning_handler.cc ('k') | ash/accelerators/key_hold_detector.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_ 5 #ifndef ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_
6 #define ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_ 6 #define ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "ui/views/focus/focus_manager_delegate.h" 10 #include "ui/views/focus/focus_manager_delegate.h"
11 #include "ui/views/focus/focus_manager_factory.h" 11 #include "ui/views/focus/focus_manager_factory.h"
12 12
13 namespace ash { 13 namespace ash {
14 14
15 // A factory class for creating a custom views::FocusManager object which 15 // A factory class for creating a custom views::FocusManager object which
16 // supports Ash shortcuts. 16 // supports Ash shortcuts.
17 class AshFocusManagerFactory : public views::FocusManagerFactory { 17 class AshFocusManagerFactory : public views::FocusManagerFactory {
18 public: 18 public:
19 AshFocusManagerFactory(); 19 AshFocusManagerFactory();
20 virtual ~AshFocusManagerFactory(); 20 virtual ~AshFocusManagerFactory();
21 21
22 protected: 22 protected:
23 // views::FocusManagerFactory overrides: 23 // views::FocusManagerFactory overrides:
24 virtual views::FocusManager* CreateFocusManager( 24 virtual views::FocusManager* CreateFocusManager(
25 views::Widget* widget, 25 views::Widget* widget,
26 bool desktop_widget) OVERRIDE; 26 bool desktop_widget) override;
27 27
28 private: 28 private:
29 class Delegate : public views::FocusManagerDelegate { 29 class Delegate : public views::FocusManagerDelegate {
30 public: 30 public:
31 // views::FocusManagerDelegate overrides: 31 // views::FocusManagerDelegate overrides:
32 virtual bool ProcessAccelerator( 32 virtual bool ProcessAccelerator(
33 const ui::Accelerator& accelerator) OVERRIDE; 33 const ui::Accelerator& accelerator) override;
34 virtual ui::AcceleratorTarget* GetCurrentTargetForAccelerator( 34 virtual ui::AcceleratorTarget* GetCurrentTargetForAccelerator(
35 const ui::Accelerator& accelerator) const OVERRIDE; 35 const ui::Accelerator& accelerator) const override;
36 }; 36 };
37 37
38 DISALLOW_COPY_AND_ASSIGN(AshFocusManagerFactory); 38 DISALLOW_COPY_AND_ASSIGN(AshFocusManagerFactory);
39 }; 39 };
40 40
41 } // namespace ash 41 } // namespace ash
42 42
43 #endif // ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_ 43 #endif // ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_
OLDNEW
« no previous file with comments | « ash/accelerators/exit_warning_handler.cc ('k') | ash/accelerators/key_hold_detector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698