| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/views/widget/x11_desktop_window_move_client.h" | 5 #include "ui/views/widget/x11_desktop_window_move_client.h" |
| 6 | 6 |
| 7 #include <X11/Xlib.h> | 7 #include <X11/Xlib.h> |
| 8 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. | 8 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. |
| 9 #undef RootWindow | 9 #undef RootWindow |
| 10 | 10 |
| 11 #include "base/message_loop.h" | 11 #include "base/message_loop.h" |
| 12 #include "base/message_pump_aurax11.h" | 12 #include "base/message_pump_aurax11.h" |
| 13 #include "base/run_loop.h" | 13 #include "base/run_loop.h" |
| 14 #include "ui/aura/env.h" | 14 #include "ui/aura/env.h" |
| 15 #include "ui/aura/root_window.h" | 15 #include "ui/aura/root_window.h" |
| 16 #include "ui/base/event.h" | 16 #include "ui/base/events/event.h" |
| 17 #include "ui/base/x/x11_util.h" | 17 #include "ui/base/x/x11_util.h" |
| 18 #include "ui/gfx/screen.h" | 18 #include "ui/gfx/screen.h" |
| 19 | 19 |
| 20 namespace views { | 20 namespace views { |
| 21 | 21 |
| 22 X11DesktopWindowMoveClient::X11DesktopWindowMoveClient() | 22 X11DesktopWindowMoveClient::X11DesktopWindowMoveClient() |
| 23 : in_move_loop_(false) { | 23 : in_move_loop_(false) { |
| 24 } | 24 } |
| 25 | 25 |
| 26 X11DesktopWindowMoveClient::~X11DesktopWindowMoveClient() {} | 26 X11DesktopWindowMoveClient::~X11DesktopWindowMoveClient() {} |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 | 114 |
| 115 // Ungrab before we let go of the window. | 115 // Ungrab before we let go of the window. |
| 116 Display* display = base::MessagePumpAuraX11::GetDefaultXDisplay(); | 116 Display* display = base::MessagePumpAuraX11::GetDefaultXDisplay(); |
| 117 XUngrabPointer(display, CurrentTime); | 117 XUngrabPointer(display, CurrentTime); |
| 118 | 118 |
| 119 in_move_loop_ = false; | 119 in_move_loop_ = false; |
| 120 quit_closure_.Run(); | 120 quit_closure_.Run(); |
| 121 } | 121 } |
| 122 | 122 |
| 123 } // namespace views | 123 } // namespace views |
| OLD | NEW |