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

Side by Side Diff: chrome/browser/chromeos/system_key_event_listener.cc

Issue 14113053: chrome: Use base::MessageLoop. (Part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
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 #include "chrome/browser/chromeos/system_key_event_listener.h" 5 #include "chrome/browser/chromeos/system_key_event_listener.h"
6 6
7 #define XK_MISCELLANY 1 7 #define XK_MISCELLANY 1
8 #include <X11/keysymdef.h> 8 #include <X11/keysymdef.h>
9 #include <X11/XF86keysym.h> 9 #include <X11/XF86keysym.h>
10 #include <X11/XKBlib.h> 10 #include <X11/XKBlib.h>
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 &xkb_minor_version)) { 63 &xkb_minor_version)) {
64 LOG(WARNING) << "Could not query Xkb extension"; 64 LOG(WARNING) << "Could not query Xkb extension";
65 } 65 }
66 66
67 if (!XkbSelectEvents(display, XkbUseCoreKbd, 67 if (!XkbSelectEvents(display, XkbUseCoreKbd,
68 XkbStateNotifyMask, 68 XkbStateNotifyMask,
69 XkbStateNotifyMask)) { 69 XkbStateNotifyMask)) {
70 LOG(WARNING) << "Could not install Xkb Indicator observer"; 70 LOG(WARNING) << "Could not install Xkb Indicator observer";
71 } 71 }
72 72
73 MessageLoopForUI::current()->AddObserver(this); 73 base::MessageLoopForUI::current()->AddObserver(this);
74 } 74 }
75 75
76 SystemKeyEventListener::~SystemKeyEventListener() { 76 SystemKeyEventListener::~SystemKeyEventListener() {
77 Stop(); 77 Stop();
78 } 78 }
79 79
80 void SystemKeyEventListener::Stop() { 80 void SystemKeyEventListener::Stop() {
81 if (stopped_) 81 if (stopped_)
82 return; 82 return;
83 MessageLoopForUI::current()->RemoveObserver(this); 83 base::MessageLoopForUI::current()->RemoveObserver(this);
84 stopped_ = true; 84 stopped_ = true;
85 } 85 }
86 86
87 void SystemKeyEventListener::AddCapsLockObserver(CapsLockObserver* observer) { 87 void SystemKeyEventListener::AddCapsLockObserver(CapsLockObserver* observer) {
88 caps_lock_observers_.AddObserver(observer); 88 caps_lock_observers_.AddObserver(observer);
89 } 89 }
90 90
91 void SystemKeyEventListener::AddModifiersObserver(ModifiersObserver* observer) { 91 void SystemKeyEventListener::AddModifiersObserver(ModifiersObserver* observer) {
92 modifiers_observers_.AddObserver(observer); 92 modifiers_observers_.AddObserver(observer);
93 } 93 }
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 pressed_modifiers_ = current_modifiers; 153 pressed_modifiers_ = current_modifiers;
154 OnModifiers(pressed_modifiers_); 154 OnModifiers(pressed_modifiers_);
155 } 155 }
156 return true; 156 return true;
157 } 157 }
158 } 158 }
159 return false; 159 return false;
160 } 160 }
161 161
162 } // namespace chromeos 162 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698