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

Side by Side Diff: athena/input/accelerator_manager_impl.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, 1 month 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 23 matching lines...) Expand all
34 class AcceleratorWrapper; 34 class AcceleratorWrapper;
35 35
36 // Creates an AcceleratorManager for global accelerators. 36 // Creates an AcceleratorManager for global accelerators.
37 // This is the one returned by AcceleratorManager::Get() 37 // This is the one returned by AcceleratorManager::Get()
38 static AcceleratorManagerImpl* CreateGlobalAcceleratorManager(); 38 static AcceleratorManagerImpl* CreateGlobalAcceleratorManager();
39 39
40 // Creates an AcceleratorManager for focus manager. 40 // Creates an AcceleratorManager for focus manager.
41 static scoped_ptr<AcceleratorManager> CreateForFocusManager( 41 static scoped_ptr<AcceleratorManager> CreateForFocusManager(
42 views::FocusManager* focus_manager); 42 views::FocusManager* focus_manager);
43 43
44 virtual ~AcceleratorManagerImpl(); 44 ~AcceleratorManagerImpl() override;
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,
(...skipping 23 matching lines...) Expand all
78 scoped_ptr<wm::AcceleratorFilter> accelerator_filter_; 78 scoped_ptr<wm::AcceleratorFilter> accelerator_filter_;
79 scoped_ptr<wm::NestedAcceleratorController> nested_accelerator_controller_; 79 scoped_ptr<wm::NestedAcceleratorController> nested_accelerator_controller_;
80 bool debug_accelerators_enabled_; 80 bool debug_accelerators_enabled_;
81 81
82 DISALLOW_COPY_AND_ASSIGN(AcceleratorManagerImpl); 82 DISALLOW_COPY_AND_ASSIGN(AcceleratorManagerImpl);
83 }; 83 };
84 84
85 } // namespace athena 85 } // namespace athena
86 86
87 #endif // ATHENA_INPUT_ACCELERATOR_MANAGER_H_ 87 #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