| 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/desktop_aura/x11_desktop_window_move_client.h" | 5 #include "ui/views/widget/desktop_aura/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/debug/stack_trace.h" | 11 #include "base/debug/stack_trace.h" |
| 12 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
| 13 #include "base/message_loop/message_pump_aurax11.h" | 13 #include "base/message_loop/message_pump_x11.h" |
| 14 #include "base/run_loop.h" | 14 #include "base/run_loop.h" |
| 15 #include "ui/aura/env.h" | 15 #include "ui/aura/env.h" |
| 16 #include "ui/aura/root_window.h" | 16 #include "ui/aura/root_window.h" |
| 17 #include "ui/base/events/event.h" | 17 #include "ui/base/events/event.h" |
| 18 #include "ui/base/x/x11_util.h" | 18 #include "ui/base/x/x11_util.h" |
| 19 #include "ui/gfx/screen.h" | 19 #include "ui/gfx/screen.h" |
| 20 | 20 |
| 21 namespace views { | 21 namespace views { |
| 22 | 22 |
| 23 X11DesktopWindowMoveClient::X11DesktopWindowMoveClient() | 23 X11DesktopWindowMoveClient::X11DesktopWindowMoveClient() |
| (...skipping 30 matching lines...) Expand all Loading... |
| 54 | 54 |
| 55 bool success = move_loop_.RunMoveLoop(source, root_window_->last_cursor()); | 55 bool success = move_loop_.RunMoveLoop(source, root_window_->last_cursor()); |
| 56 return success ? aura::client::MOVE_SUCCESSFUL : aura::client::MOVE_CANCELED; | 56 return success ? aura::client::MOVE_SUCCESSFUL : aura::client::MOVE_CANCELED; |
| 57 } | 57 } |
| 58 | 58 |
| 59 void X11DesktopWindowMoveClient::EndMoveLoop() { | 59 void X11DesktopWindowMoveClient::EndMoveLoop() { |
| 60 move_loop_.EndMoveLoop(); | 60 move_loop_.EndMoveLoop(); |
| 61 } | 61 } |
| 62 | 62 |
| 63 } // namespace views | 63 } // namespace views |
| OLD | NEW |