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

Unified Diff: chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc

Issue 10905163: aura-x11: Fix touch-calibration for multi-monitor setups. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/aura/aura.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc
diff --git a/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc b/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc
index 0f2dd1bd6b0cc803d5a105cc5e2ef0e41f9d4704..9a1d5c7a25130b41eb13df18b66f12516e2d3742 100644
--- a/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc
+++ b/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc
@@ -29,23 +29,6 @@ int GetXInputOpCode() {
return xi_opcode;
}
-// Starts listening to the XI_HierarchyChanged, XI_KeyPress, and XI_KeyRelease
-// events.
-void SelectXInputEvents() {
- XIEventMask evmask;
- unsigned char mask[XIMaskLen(XI_LASTEVENT)] = {};
- XISetMask(mask, XI_HierarchyChanged);
- XISetMask(mask, XI_KeyPress);
- XISetMask(mask, XI_KeyRelease);
-
- evmask.deviceid = XIAllDevices;
- evmask.mask_len = sizeof(mask);
- evmask.mask = mask;
-
- Display* display = ui::GetXDisplay();
- XISelectEvents(display, ui::GetX11RootWindow(), &evmask, 1);
-}
-
// Checks the |event| and asynchronously sets the XKB layout when necessary.
void HandleHierarchyChangedEvent(
XIHierarchyEvent* event,
@@ -90,7 +73,6 @@ XInputHierarchyChangedEventListener::GetInstance() {
XInputHierarchyChangedEventListener::XInputHierarchyChangedEventListener()
: stopped_(false),
xiopcode_(GetXInputOpCode()) {
- SelectXInputEvents();
Init();
}
« no previous file with comments | « no previous file | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698