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

Side by Side Diff: ui/aura/test/ui_controls_factory_aurax11.cc

Issue 17078005: Move message_pump to base/message_loop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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
« no previous file with comments | « ui/aura/root_window_host_x11.cc ('k') | ui/base/clipboard/clipboard_aurax11.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <X11/keysym.h> 5 #include <X11/keysym.h>
6 #include <X11/Xlib.h> 6 #include <X11/Xlib.h>
7 7
8 // X macro fail. 8 // X macro fail.
9 #if defined(RootWindow) 9 #if defined(RootWindow)
10 #undef RootWindow 10 #undef RootWindow
11 #endif 11 #endif
12 12
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/message_pump_aurax11.h" 14 #include "base/message_loop/message_pump_aurax11.h"
15 #include "ui/aura/client/screen_position_client.h" 15 #include "ui/aura/client/screen_position_client.h"
16 #include "ui/aura/env.h" 16 #include "ui/aura/env.h"
17 #include "ui/aura/root_window.h" 17 #include "ui/aura/root_window.h"
18 #include "ui/aura/test/ui_controls_factory_aura.h" 18 #include "ui/aura/test/ui_controls_factory_aura.h"
19 #include "ui/base/keycodes/keyboard_code_conversion_x.h" 19 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
20 #include "ui/base/test/ui_controls_aura.h" 20 #include "ui/base/test/ui_controls_aura.h"
21 #include "ui/compositor/dip_util.h" 21 #include "ui/compositor/dip_util.h"
22 22
23 namespace aura { 23 namespace aura {
24 namespace test { 24 namespace test {
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 }; 249 };
250 250
251 } // namespace 251 } // namespace
252 252
253 UIControlsAura* CreateUIControlsAura(aura::RootWindow* root_window) { 253 UIControlsAura* CreateUIControlsAura(aura::RootWindow* root_window) {
254 return new UIControlsX11(root_window); 254 return new UIControlsX11(root_window);
255 } 255 }
256 256
257 } // namespace test 257 } // namespace test
258 } // namespace aura 258 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/root_window_host_x11.cc ('k') | ui/base/clipboard/clipboard_aurax11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698