Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Side by Side Diff: trunk/src/ui/views/widget/desktop_aura/x11_desktop_window_move_client.cc

Issue 16897005: Revert 206507 "Move message_pump to base/message_loop." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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.h"
13 #include "base/message_loop/message_pump_aurax11.h" 13 #include "base/message_pump_aurax11.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 26 matching lines...) Expand all
50 50
51 bool success = move_loop_.RunMoveLoop(source); 51 bool success = move_loop_.RunMoveLoop(source);
52 return success ? aura::client::MOVE_SUCCESSFUL : aura::client::MOVE_CANCELED; 52 return success ? aura::client::MOVE_SUCCESSFUL : aura::client::MOVE_CANCELED;
53 } 53 }
54 54
55 void X11DesktopWindowMoveClient::EndMoveLoop() { 55 void X11DesktopWindowMoveClient::EndMoveLoop() {
56 move_loop_.EndMoveLoop(); 56 move_loop_.EndMoveLoop();
57 } 57 }
58 58
59 } // namespace views 59 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698