| Index: ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc
|
| diff --git a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc
|
| index 2c26580e7e67a93fdc42259dee8797e675443e0e..dbc322425b78ad5c72efd11fede8ae876775b998 100644
|
| --- a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc
|
| +++ b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc
|
| @@ -64,7 +64,7 @@ bool X11WholeScreenMoveLoop::RunMoveLoop(aura::Window* source,
|
| DCHECK(!in_move_loop_); // Can only handle one nested loop at a time.
|
| in_move_loop_ = true;
|
|
|
| - Display* display = base::MessagePumpX11::GetDefaultXDisplay();
|
| + Display* display = ui::GetXDisplay();
|
|
|
| // Creates an invisible, InputOnly toplevel window. This window will receive
|
| // all mouse movement for drags. It turns out that normal windows doing a
|
| @@ -116,7 +116,7 @@ void X11WholeScreenMoveLoop::EndMoveLoop() {
|
| // the chrome process.
|
|
|
| // Ungrab before we let go of the window.
|
| - Display* display = base::MessagePumpX11::GetDefaultXDisplay();
|
| + Display* display = ui::GetXDisplay();
|
| XUngrabPointer(display, CurrentTime);
|
|
|
| base::MessagePumpX11::Current()->RemoveDispatcherForWindow(
|
| @@ -129,7 +129,7 @@ void X11WholeScreenMoveLoop::EndMoveLoop() {
|
| }
|
|
|
| bool X11WholeScreenMoveLoop::GrabPointerWithCursor(gfx::NativeCursor cursor) {
|
| - Display* display = base::MessagePumpX11::GetDefaultXDisplay();
|
| + Display* display = ui::GetXDisplay();
|
| XGrabServer(display);
|
| XUngrabPointer(display, CurrentTime);
|
| int ret = XGrabPointer(
|
|
|