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

ui/views/widget/desktop_aura/x11_desktop_handler.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/x11_desktop_handler.h"
 
 #include "base/message_loop/message_loop.h"
 #include "ui/aura/env.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
@@ skipping 20 matching lines @@
 
 // static
 X11DesktopHandler* X11DesktopHandler::get() {
   if (!g_handler)
     g_handler = new X11DesktopHandler;
 
   return g_handler;
 }
 
 X11DesktopHandler::X11DesktopHandler()
-    : xdisplay_(base::MessagePumpX11::GetDefaultXDisplay()),
+    : xdisplay_(ui::GetXDisplay()),
       x_root_window_(DefaultRootWindow(xdisplay_)),
       current_window_(None),
       atom_cache_(xdisplay_, kAtomsToCache) {
   base::MessagePumpX11::Current()->AddDispatcherForRootWindow(this);
   aura::Env::GetInstance()->AddObserver(this);
 
   XWindowAttributes attr;
   XGetWindowAttributes(xdisplay_, x_root_window_, &attr);
   XSelectInput(xdisplay_, x_root_window_,
                attr.your_event_mask | PropertyChangeMask |
                StructureNotifyMask | SubstructureNotifyMask);
 }
 
 X11DesktopHandler::~X11DesktopHandler() {
   aura::Env::GetInstance()->RemoveObserver(this);
   base::MessagePumpX11::Current()->RemoveDispatcherForRootWindow(this);
 }
 
 void X11DesktopHandler::ActivateWindow(::Window window) {
-  DCHECK_EQ(base::MessagePumpX11::GetDefaultXDisplay(), xdisplay_);
+  DCHECK_EQ(ui::GetXDisplay(), xdisplay_);
 
   XEvent xclient;
   memset(&xclient, 0, sizeof(xclient));
   xclient.type = ClientMessage;
   xclient.xclient.window = window;
   xclient.xclient.message_type = atom_cache_.GetAtom("_NET_ACTIVE_WINDOW");
   xclient.xclient.format = 32;
   xclient.xclient.data.l[0] = 1;  // Specified we are an app.
   xclient.xclient.data.l[1] = CurrentTime;
   xclient.xclient.data.l[2] = None;
@@ skipping 46 matching lines @@
 
   DesktopRootWindowHostX11* new_host =
       views::DesktopRootWindowHostX11::GetHostForXID(xid);
   if (new_host)
     new_host->HandleNativeWidgetActivationChanged(true);
 
   current_window_ = xid;
 }
 
 }  // namespace views