| OLD | NEW |
| 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 #include "chrome/browser/chromeos/events/event_rewriter.h" | 5 #include "chrome/browser/chromeos/events/event_rewriter.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "ash/sticky_keys/sticky_keys_controller.h" | 9 #include "ash/sticky_keys/sticky_keys_controller.h" |
| 10 #include "ash/wm/window_state.h" | 10 #include "ash/wm/window_state.h" |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 // Update native event to match rewritten |ui::Event|. | 256 // Update native event to match rewritten |ui::Event|. |
| 257 // The X11 keycode represents a physical key position, so it shouldn't | 257 // The X11 keycode represents a physical key position, so it shouldn't |
| 258 // change unless we have actually changed keys, not just modifiers. | 258 // change unless we have actually changed keys, not just modifiers. |
| 259 // This is one guard against problems like crbug.com/390263. | 259 // This is one guard against problems like crbug.com/390263. |
| 260 if (key_event.key_code() != key_code) { | 260 if (key_event.key_code() != key_code) { |
| 261 xkeyevent.xkey.keycode = | 261 xkeyevent.xkey.keycode = |
| 262 XKeyCodeForWindowsKeyCode(key_code, flags, gfx::GetXDisplay()); | 262 XKeyCodeForWindowsKeyCode(key_code, flags, gfx::GetXDisplay()); |
| 263 } | 263 } |
| 264 | 264 |
| 265 UpdateX11EventMask(flags, &xkeyevent.xkey.state); | 265 UpdateX11EventMask(flags, &xkeyevent.xkey.state); |
| 266 ui::KeyEvent x11_key_event(&xkeyevent, false); | 266 ui::KeyEvent x11_key_event(&xkeyevent); |
| 267 rewritten_key_event = new ui::KeyEvent(x11_key_event); | 267 rewritten_key_event = new ui::KeyEvent(x11_key_event); |
| 268 } | 268 } |
| 269 #endif | 269 #endif |
| 270 if (!rewritten_key_event) | 270 if (!rewritten_key_event) |
| 271 rewritten_key_event = new ui::KeyEvent(key_event); | 271 rewritten_key_event = new ui::KeyEvent(key_event); |
| 272 rewritten_key_event->set_flags(flags); | 272 rewritten_key_event->set_flags(flags); |
| 273 rewritten_key_event->set_key_code(key_code); | 273 rewritten_key_event->set_key_code(key_code); |
| 274 rewritten_key_event->set_character( | 274 rewritten_key_event->set_character( |
| 275 ui::GetCharacterFromKeyCode(key_code, flags)); | 275 ui::GetCharacterFromKeyCode(key_code, flags)); |
| 276 rewritten_key_event->NormalizeFlags(); | 276 rewritten_key_event->NormalizeFlags(); |
| (...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 942 KeyboardDeviceAddedInternal(device_info[i].deviceid, device_info[i].name); | 942 KeyboardDeviceAddedInternal(device_info[i].deviceid, device_info[i].name); |
| 943 } | 943 } |
| 944 | 944 |
| 945 XIFreeDeviceInfo(device_info); | 945 XIFreeDeviceInfo(device_info); |
| 946 #else | 946 #else |
| 947 KeyboardDeviceAddedInternal(device_id, "keyboard"); | 947 KeyboardDeviceAddedInternal(device_id, "keyboard"); |
| 948 #endif | 948 #endif |
| 949 } | 949 } |
| 950 | 950 |
| 951 } // namespace chromeos | 951 } // namespace chromeos |
| OLD | NEW |