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

Side by Side Diff: ui/base/accelerators/accelerator_history.h

Issue 1161853004: Revert "Converting (Alt+LeftClick -> RightClick) to (Search+LeftClick -> RightClick)" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
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_BASE_ACCELERATORS_ACCELERATOR_HISTORY_H_ 5 #ifndef UI_BASE_ACCELERATORS_ACCELERATOR_HISTORY_H_
6 #define UI_BASE_ACCELERATORS_ACCELERATOR_HISTORY_H_ 6 #define UI_BASE_ACCELERATORS_ACCELERATOR_HISTORY_H_
7 7
8 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
9 #include "ui/base/accelerators/accelerator.h" 9 #include "ui/base/accelerators/accelerator.h"
10 #include "ui/base/ui_base_export.h" 10 #include "ui/base/ui_base_export.h"
11 #include "ui/events/event.h" 11 #include "ui/events/event.h"
12 #include "ui/events/event_handler.h" 12 #include "ui/events/event_handler.h"
13 13
14 namespace ui { 14 namespace ui {
15 15
16 // Keeps track of the system-wide current and the most recent previous 16 // Keeps track of the system-wide current and the most recent previous
17 // key accelerators. 17 // key accelerators.
18 class UI_BASE_EXPORT AcceleratorHistory { 18 class UI_BASE_EXPORT AcceleratorHistory {
19 public: 19 public:
20 AcceleratorHistory(); 20 AcceleratorHistory();
21 ~AcceleratorHistory(); 21 ~AcceleratorHistory();
22 22
23 // Returns the most recent recorded accelerator. 23 // Returns the most recent recorded accelerator.
24 const Accelerator& current_accelerator() const { 24 const Accelerator& current_accelerator() const {
25 return current_accelerator_; 25 return current_accelerator_;
26 } 26 }
27 27
28 // Returns the most recent previously recorded key accelerator that is 28 // Returns the most recent previously recorded accelerator that is different
29 // different than the current. Non-synthesized mouse events will be stored 29 // than the current.
30 // in the histroy as an empty accelerator.
31 const Accelerator& previous_accelerator() const { 30 const Accelerator& previous_accelerator() const {
32 return previous_accelerator_; 31 return previous_accelerator_;
33 } 32 }
34 33
35 // Stores the given |accelerator| only if it's different than the currently 34 // Stores the given |accelerator| only if it's different than the currently
36 // stored one. 35 // stored one.
37 void StoreCurrentAccelerator(const Accelerator& accelerator); 36 void StoreCurrentAccelerator(const Accelerator& accelerator);
38 37
39 private: 38 private:
40 Accelerator current_accelerator_; 39 Accelerator current_accelerator_;
41 Accelerator previous_accelerator_; 40 Accelerator previous_accelerator_;
42 41
43 DISALLOW_COPY_AND_ASSIGN(AcceleratorHistory); 42 DISALLOW_COPY_AND_ASSIGN(AcceleratorHistory);
44 }; 43 };
45 44
46 }; // namespace ui 45 }; // namespace ui
47 46
48 #endif // UI_BASE_ACCELERATORS_ACCELERATOR_HISTORY_H_ 47 #endif // UI_BASE_ACCELERATORS_ACCELERATOR_HISTORY_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/events/event_rewriter_unittest.cc ('k') | ui/wm/core/accelerator_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698