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

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: rebase again Created 7 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 | 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 &xkb_minor_version)) { 62 &xkb_minor_version)) {
63 LOG(WARNING) << "Could not query Xkb extension"; 63 LOG(WARNING) << "Could not query Xkb extension";
64 } 64 }
65 65
66 if (!XkbSelectEvents(display, XkbUseCoreKbd, 66 if (!XkbSelectEvents(display, XkbUseCoreKbd,
67 XkbStateNotifyMask, 67 XkbStateNotifyMask,
68 XkbStateNotifyMask)) { 68 XkbStateNotifyMask)) {
69 LOG(WARNING) << "Could not install Xkb Indicator observer"; 69 LOG(WARNING) << "Could not install Xkb Indicator observer";
70 } 70 }
71 71
72 MessageLoopForUI::current()->AddObserver(this); 72 base::MessageLoopForUI::current()->AddObserver(this);
73 } 73 }
74 74
75 SystemKeyEventListener::~SystemKeyEventListener() { 75 SystemKeyEventListener::~SystemKeyEventListener() {
76 Stop(); 76 Stop();
77 } 77 }
78 78
79 void SystemKeyEventListener::Stop() { 79 void SystemKeyEventListener::Stop() {
80 if (stopped_) 80 if (stopped_)
81 return; 81 return;
82 MessageLoopForUI::current()->RemoveObserver(this); 82 base::MessageLoopForUI::current()->RemoveObserver(this);
83 stopped_ = true; 83 stopped_ = true;
84 } 84 }
85 85
86 void SystemKeyEventListener::AddCapsLockObserver(CapsLockObserver* observer) { 86 void SystemKeyEventListener::AddCapsLockObserver(CapsLockObserver* observer) {
87 caps_lock_observers_.AddObserver(observer); 87 caps_lock_observers_.AddObserver(observer);
88 } 88 }
89 89
90 void SystemKeyEventListener::AddModifiersObserver(ModifiersObserver* observer) { 90 void SystemKeyEventListener::AddModifiersObserver(ModifiersObserver* observer) {
91 modifiers_observers_.AddObserver(observer); 91 modifiers_observers_.AddObserver(observer);
92 } 92 }
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 pressed_modifiers_ = current_modifiers; 152 pressed_modifiers_ = current_modifiers;
153 OnModifiers(pressed_modifiers_); 153 OnModifiers(pressed_modifiers_);
154 } 154 }
155 return true; 155 return true;
156 } 156 }
157 } 157 }
158 return false; 158 return false;
159 } 159 }
160 160
161 } // namespace chromeos 161 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/system_key_event_listener.h ('k') | chrome/browser/chromeos/web_socket_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698