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

Side by Side Diff: chrome/browser/chromeos/input_method/hotkey_manager.cc

Issue 7869005: Make chromeos_clang bot happy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chromeos/input_method/hotkey_manager.h ('k') | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "chrome/browser/chromeos/input_method/hotkey_manager.h" 5 #include "chrome/browser/chromeos/input_method/hotkey_manager.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 10
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 COMPILE_ASSERT(Mod3Mask != (1U << 31), CheckMaskValue); 64 COMPILE_ASSERT(Mod3Mask != (1U << 31), CheckMaskValue);
65 COMPILE_ASSERT(Mod4Mask != (1U << 31), CheckMaskValue); 65 COMPILE_ASSERT(Mod4Mask != (1U << 31), CheckMaskValue);
66 COMPILE_ASSERT(Mod5Mask != (1U << 31), CheckMaskValue); 66 COMPILE_ASSERT(Mod5Mask != (1U << 31), CheckMaskValue);
67 67
68 HotkeyManager::HotkeyManager() 68 HotkeyManager::HotkeyManager()
69 : previous_keysym_(NoSymbol), 69 : previous_keysym_(NoSymbol),
70 previous_modifiers_(0x0U), 70 previous_modifiers_(0x0U),
71 filter_release_events_(false) { 71 filter_release_events_(false) {
72 } 72 }
73 73
74 HotkeyManager::~HotkeyManager() {
75 }
76
74 void HotkeyManager::AddObserver(Observer* observer) { 77 void HotkeyManager::AddObserver(Observer* observer) {
75 observers_.AddObserver(observer); 78 observers_.AddObserver(observer);
76 } 79 }
77 80
78 void HotkeyManager::RemoveObserver(Observer* observer) { 81 void HotkeyManager::RemoveObserver(Observer* observer) {
79 observers_.RemoveObserver(observer); 82 observers_.RemoveObserver(observer);
80 } 83 }
81 84
82 bool HotkeyManager::AddHotkey(int event_id, 85 bool HotkeyManager::AddHotkey(int event_id,
83 uint32 keysym, 86 uint32 keysym,
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 previous_keysym_ = keysym; 184 previous_keysym_ = keysym;
182 previous_modifiers_ = modifiers; 185 previous_modifiers_ = modifiers;
183 // Start filtering release events if a hotkey is detected. 186 // Start filtering release events if a hotkey is detected.
184 filter_release_events_ = (event_id != kNoEvent); 187 filter_release_events_ = (event_id != kNoEvent);
185 188
186 return event_id; 189 return event_id;
187 } 190 }
188 191
189 } // namespace input_method 192 } // namespace input_method
190 } // namespace chromeos 193 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/input_method/hotkey_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698