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" |
11 #include "ash/wm/window_util.h" | 11 #include "ash/wm/window_util.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/logging.h" | 13 #include "base/logging.h" |
14 #include "base/macros.h" | 14 #include "base/macros.h" |
15 #include "base/prefs/pref_service.h" | 15 #include "base/prefs/pref_service.h" |
16 #include "base/strings/string_util.h" | 16 #include "base/strings/string_util.h" |
17 #include "base/sys_info.h" | 17 #include "base/sys_info.h" |
18 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" | 18 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
19 #include "chrome/browser/extensions/extension_commands_global_registry.h" | 19 #include "chrome/browser/extensions/extension_commands_global_registry.h" |
20 #include "chrome/browser/profiles/profile_manager.h" | 20 #include "chrome/browser/profiles/profile_manager.h" |
21 #include "chrome/common/pref_names.h" | 21 #include "chrome/common/pref_names.h" |
22 #include "chromeos/chromeos_switches.h" | 22 #include "chromeos/chromeos_switches.h" |
| 23 #include "chromeos/ime/ime_keyboard.h" |
| 24 #include "chromeos/ime/input_method_manager.h" |
23 #include "components/user_manager/user_manager.h" | 25 #include "components/user_manager/user_manager.h" |
24 #include "ui/base/ime/chromeos/ime_keyboard.h" | |
25 #include "ui/base/ime/chromeos/input_method_manager.h" | |
26 #include "ui/events/event.h" | 26 #include "ui/events/event.h" |
27 #include "ui/events/event_utils.h" | 27 #include "ui/events/event_utils.h" |
28 #include "ui/events/keycodes/keyboard_code_conversion.h" | 28 #include "ui/events/keycodes/keyboard_code_conversion.h" |
29 #include "ui/wm/core/window_util.h" | 29 #include "ui/wm/core/window_util.h" |
30 | 30 |
31 #if defined(USE_X11) | 31 #if defined(USE_X11) |
32 #include <X11/extensions/XInput2.h> | 32 #include <X11/extensions/XInput2.h> |
33 #include <X11/Xatom.h> | 33 #include <X11/Xatom.h> |
34 #include <X11/Xlib.h> | 34 #include <X11/Xlib.h> |
35 | 35 |
(...skipping 960 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
996 // TODO(spang): Figure out where we can get keyboard vendor/product id from in | 996 // TODO(spang): Figure out where we can get keyboard vendor/product id from in |
997 // Ozone/Freon version. | 997 // Ozone/Freon version. |
998 return KeyboardDeviceAddedInternal(device_id, | 998 return KeyboardDeviceAddedInternal(device_id, |
999 "keyboard", | 999 "keyboard", |
1000 kUnknownVendorId, | 1000 kUnknownVendorId, |
1001 kUnknownProductId); | 1001 kUnknownProductId); |
1002 #endif | 1002 #endif |
1003 } | 1003 } |
1004 | 1004 |
1005 } // namespace chromeos | 1005 } // namespace chromeos |
OLD | NEW |