Revert 93629 - Linux build failure: http://build.chromium.org/p/chromium/builders/Linux%20Builder%20%28dbg%29%28shared%29/builds/4098/steps/compile/logs/stdio#error1

Consolidate access to X Display

Change ui::GetXDisplay to use the MessagePumpForUI class
to get Display. This allows us to have two different
implementation for x and gtk.

 Remove MessageLoop::GetDisplay from message loop API.
Client should use ui::GetXDisplay instead. This
will also be removed in near future, and client should get
display from window it is dealing with.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/7484006

TBR=oshima@google.com
Review URL: http://codereview.chromium.org/7493014

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

1 files changed, 3 insertions, 4 deletions

diff --git a/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc b/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc
index 7daba16..bf1ab56 100644
--- a/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc
+++ b/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc
@@ -9,7 +9,6 @@
 #include <X11/extensions/XInput2.h>
 
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
-#include "ui/base/x/x11_util.h"
 
 namespace {
 
@@ -20,8 +19,8 @@ int GetXInputOpCode() {
   int event;
   int error;
 
-  if (!XQueryExtension(
-          ui::GetXDisplay(), kExtensionName, &xi_opcode, &event, &error)) {
+  Display* display = MessageLoopForUI::current()->GetDisplay();
+  if (!XQueryExtension(display, kExtensionName, &xi_opcode, &event, &error)) {
     VLOG(1) << "X Input extension not available: error=" << error;
     return -1;
   }
@@ -38,7 +37,7 @@ void SelectXInputEvents() {
   evmask.mask_len = sizeof(mask);
   evmask.mask = mask;
 
-  Display* display = ui::GetXDisplay();
+  Display* display = MessageLoopForUI::current()->GetDisplay();
   XISelectEvents(display, DefaultRootWindow(display), &evmask, 1);
 }