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

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

Issue 6975045: touch: Always expect XInput2 availability. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 5 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
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 22b89fe485e3d551ffe96b01b486edfe4f17dade..bf1ab5623460452efb99bee06f42cc6a3bbd8f50 100644
--- a/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc
+++ b/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc
@@ -2,9 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// TODO(yusukes): Remove the #if once the ARM bot (crbug.com/84694) is fixed.
-#if defined(HAVE_XINPUT2)
-
#include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"
#include <gdk/gdkx.h>
@@ -135,10 +132,3 @@ bool XInputHierarchyChangedEventListener::ProcessedXEvent(XEvent* xevent) {
}
} // namespace chromeos
-
-#endif
-
-// TODO(yusukes): Remove this check when crbug.com/84694 is resolved.
-#if defined(ARCH_CPU_X86_FAMILY) && !defined(HAVE_XINPUT2)
-#error XINPUT2 should always be enabled on Chrome OS x86!
-#endif
« no previous file with comments | « chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h ('k') | chrome/browser/ui/browser_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698