x11: Prefer using ui::GetXDisplay() over getting the Display from the X11 message-pump.

ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h"
 
 #include <X11/Xatom.h>
 
 #include "base/event_types.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 220 matching lines @@
     }
   }
 
   DesktopDragDropClientAuraX11* client =
       DesktopDragDropClientAuraX11::GetForWindow(source_window_);
   if (!client) {
     // The window doesn't have a DesktopDragDropClientAuraX11, that means it's
     // created by some other process. Listen for messages on it.
     base::MessagePumpX11::Current()->AddDispatcherForWindow(
         this, source_window_);
-    XSelectInput(base::MessagePumpX11::GetDefaultXDisplay(),
+    XSelectInput(ui::GetXDisplay(),
                  source_window_, PropertyChangeMask);

[oshima, 2013/09/17 15:05:10]

ditto

[sadrul, 2013/09/17 15:28:44]

Done.

 
     // We must perform a full sync here because we could be racing
     // |source_window_|.
-    XSync(base::MessagePumpX11::GetDefaultXDisplay(), False);
+    XSync(ui::GetXDisplay(), False);
   } else {
     // This drag originates from an aura window within our process. This means
     // that we can shortcut the X11 server and ask the owning SelectionOwner
     // for the data it's offering.
     fetched_targets_ = client->GetFormatMap();
     unfetched_targets_.clear();
   }
 
   ReadActions();
 }
@@ skipping 25 matching lines @@
     RequestNextTarget();
   } else {
     client->CompleteXdndPosition(source_window, screen_point);
   }
 }
 
 void DesktopDragDropClientAuraX11::X11DragContext::RequestNextTarget() {
   ::Atom target = unfetched_targets_.back();
   unfetched_targets_.pop_back();
 
-  XConvertSelection(base::MessagePumpX11::GetDefaultXDisplay(),
+  XConvertSelection(ui::GetXDisplay(),
                     atom_cache_->GetAtom(kXdndSelection),
                     target,
                     atom_cache_->GetAtom(kChromiumDragReciever),
                     local_window_,
                     CurrentTime);
 }
 
 void DesktopDragDropClientAuraX11::X11DragContext::OnSelectionNotify(
     const XSelectionEvent& event) {
   DCHECK(waiting_to_handle_position_);
@@ skipping 611 matching lines @@
   // GdkEvent about the failed drag. (And sending this message doesn't appear
   // to go through normal xlib machinery, but instead passes through the low
   // level xProto (the x11 wire format) that I don't understand.
   //
   // I'm unsure if I have to jump through those hoops, or if XSendEvent is
   // sufficient.
   XSendEvent(xdisplay_, xid, False, 0, xev);
 }
 
 }  // namespace views