OLD | NEW |
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> |
11 #undef Status | 11 #undef Status |
12 | 12 |
| 13 #include "base/message_pump_x.h" |
13 #include "chrome/browser/chromeos/input_method/input_method_manager.h" | 14 #include "chrome/browser/chromeos/input_method/input_method_manager.h" |
14 #include "chrome/browser/chromeos/input_method/xkeyboard.h" | 15 #include "chrome/browser/chromeos/input_method/xkeyboard.h" |
15 #include "ui/base/x/x11_util.h" | 16 #include "ui/base/x/x11_util.h" |
16 | 17 |
17 #if defined(USE_WAYLAND) | |
18 #include "base/message_pump_wayland.h" | |
19 #else | |
20 #include "base/message_pump_x.h" | |
21 #endif | |
22 | |
23 namespace chromeos { | 18 namespace chromeos { |
24 | 19 |
25 namespace { | 20 namespace { |
26 static SystemKeyEventListener* g_system_key_event_listener = NULL; | 21 static SystemKeyEventListener* g_system_key_event_listener = NULL; |
27 } // namespace | 22 } // namespace |
28 | 23 |
29 // static | 24 // static |
30 void SystemKeyEventListener::Initialize() { | 25 void SystemKeyEventListener::Initialize() { |
31 CHECK(!g_system_key_event_listener); | 26 CHECK(!g_system_key_event_listener); |
32 g_system_key_event_listener = new SystemKeyEventListener(); | 27 g_system_key_event_listener = new SystemKeyEventListener(); |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 input_method_manager->GetXKeyboard()->SetLockedModifiers( | 139 input_method_manager->GetXKeyboard()->SetLockedModifiers( |
145 new_caps_lock_state, new_num_lock_state); | 140 new_caps_lock_state, new_num_lock_state); |
146 | 141 |
147 return true; | 142 return true; |
148 } | 143 } |
149 } | 144 } |
150 return false; | 145 return false; |
151 } | 146 } |
152 | 147 |
153 } // namespace chromeos | 148 } // namespace chromeos |
OLD | NEW |