Revert 233414 "x11: Move XInput2 availability information out of..."

> x11: Move XInput2 availability information out of the message pump.
> 
> BUG=302696
> R=darin@chromium.org, derat@chromium.org
> 
> Review URL: https://codereview.chromium.org/52823002

TBR=sadrul@chromium.org

Review URL: https://codereview.chromium.org/63443002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233416 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 14 insertions, 1 deletions

diff --git a/base/message_loop/message_pump_x11.cc b/base/message_loop/message_pump_x11.cc
index 35dcc04..dd8b965e 100644
--- a/base/message_loop/message_pump_x11.cc
+++ b/base/message_loop/message_pump_x11.cc
@@ -53,7 +53,7 @@ GSourceFuncs XSourceFuncs = {
 Display* g_xdisplay = NULL;
 int g_xinput_opcode = -1;
 
-bool InitializeXInput2() {
+bool InitializeXInput2Internal() {
   Display* display = MessagePumpX11::GetDefaultXDisplay();
   if (!display)
     return false;
@@ -97,6 +97,11 @@ Window FindEventTarget(const NativeEvent& xev) {
   return target;
 }
 
+bool InitializeXInput2() {
+  static bool xinput2_supported = InitializeXInput2Internal();
+  return xinput2_supported;
+}
+
 bool InitializeXkb() {
   Display* display = MessagePumpX11::GetDefaultXDisplay();
   if (!display)
@@ -148,6 +153,11 @@ Display* MessagePumpX11::GetDefaultXDisplay() {
   return g_xdisplay;
 }
 
+// static
+bool MessagePumpX11::HasXInput2() {
+  return InitializeXInput2();
+}
+
 #if defined(TOOLKIT_GTK)
 // static
 MessagePumpX11* MessagePumpX11::Current() {
diff --git a/base/message_loop/message_pump_x11.h b/base/message_loop/message_pump_x11.h
index 015c230..f1f678a 100644
--- a/base/message_loop/message_pump_x11.h
+++ b/base/message_loop/message_pump_x11.h
@@ -40,6 +40,9 @@ class BASE_EXPORT MessagePumpX11 : public MessagePumpGlib,
   // Returns default X Display.
   static Display* GetDefaultXDisplay();
 
+  // Returns true if the system supports XINPUT2.
+  static bool HasXInput2();
+
   // Returns the UI or GPU message pump.
   static MessagePumpX11* Current();