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

Side by Side Diff: chrome/browser/chromeos/events/event_rewriter.cc

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 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 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 <X11/extensions/XInput2.h> 7 #include <X11/extensions/XInput2.h>
8 #include <X11/keysym.h> 8 #include <X11/keysym.h>
9 #include <X11/XF86keysym.h> 9 #include <X11/XF86keysym.h>
10 #include <X11/Xlib.h> 10 #include <X11/Xlib.h>
(...skipping 13 matching lines...) Expand all
24 #include "base/sys_info.h" 24 #include "base/sys_info.h"
25 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" 25 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h"
26 #include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener .h" 26 #include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener .h"
27 #include "chrome/browser/chromeos/login/login_display_host_impl.h" 27 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
28 #include "chrome/browser/chromeos/login/user_manager.h" 28 #include "chrome/browser/chromeos/login/user_manager.h"
29 #include "chrome/browser/profiles/profile_manager.h" 29 #include "chrome/browser/profiles/profile_manager.h"
30 #include "chrome/common/pref_names.h" 30 #include "chrome/common/pref_names.h"
31 #include "chromeos/chromeos_switches.h" 31 #include "chromeos/chromeos_switches.h"
32 #include "chromeos/ime/input_method_manager.h" 32 #include "chromeos/ime/input_method_manager.h"
33 #include "chromeos/ime/xkeyboard.h" 33 #include "chromeos/ime/xkeyboard.h"
34 #include "ui/aura/root_window.h" 34 #include "ui/aura/window_event_dispatcher.h"
35 #include "ui/base/x/x11_util.h" 35 #include "ui/base/x/x11_util.h"
36 #include "ui/events/event.h" 36 #include "ui/events/event.h"
37 #include "ui/events/event_utils.h" 37 #include "ui/events/event_utils.h"
38 #include "ui/events/keycodes/keyboard_code_conversion_x.h" 38 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
39 #include "ui/views/corewm/window_util.h" 39 #include "ui/views/corewm/window_util.h"
40 40
41 namespace { 41 namespace {
42 42
43 const int kBadDeviceId = -1; 43 const int kBadDeviceId = -1;
44 44
(...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
899 VLOG(1) << "Apple keyboard '" << device_name << "' connected: " 899 VLOG(1) << "Apple keyboard '" << device_name << "' connected: "
900 << "id=" << device_id; 900 << "id=" << device_id;
901 } 901 }
902 // Always overwrite the existing device_id since the X server may reuse a 902 // Always overwrite the existing device_id since the X server may reuse a
903 // device id for an unattached device. 903 // device id for an unattached device.
904 device_id_to_type_[device_id] = type; 904 device_id_to_type_[device_id] = type;
905 return type; 905 return type;
906 } 906 }
907 907
908 } // namespace chromeos 908 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698