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

Side by Side Diff: ui/aura/env.cc

Issue 16897006: Move message_pump to base/message_loop. (Closed) Base URL: svn://chrome-svn/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/device_list_updater_aurax11.h ('k') | ui/aura/root_window_host_x11.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 (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/aura/env.h" 5 #include "ui/aura/env.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "ui/aura/env_observer.h" 8 #include "ui/aura/env_observer.h"
9 #include "ui/aura/root_window_host.h" 9 #include "ui/aura/root_window_host.h"
10 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
11 #include "ui/compositor/compositor.h" 11 #include "ui/compositor/compositor.h"
12 #include "ui/compositor/compositor_switches.h" 12 #include "ui/compositor/compositor_switches.h"
13 13
14 #if defined(USE_X11) 14 #if defined(USE_X11)
15 #include "base/message_pump_aurax11.h" 15 #include "base/message_loop/message_pump_aurax11.h"
16 #endif 16 #endif
17 17
18 namespace aura { 18 namespace aura {
19 19
20 // static 20 // static
21 Env* Env::instance_ = NULL; 21 Env* Env::instance_ = NULL;
22 22
23 //////////////////////////////////////////////////////////////////////////////// 23 ////////////////////////////////////////////////////////////////////////////////
24 // Env, public: 24 // Env, public:
25 25
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 109
110 bool Env::CanAcceptEvent(const ui::Event& event) { 110 bool Env::CanAcceptEvent(const ui::Event& event) {
111 return true; 111 return true;
112 } 112 }
113 113
114 ui::EventTarget* Env::GetParentTarget() { 114 ui::EventTarget* Env::GetParentTarget() {
115 return NULL; 115 return NULL;
116 } 116 }
117 117
118 } // namespace aura 118 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/device_list_updater_aurax11.h ('k') | ui/aura/root_window_host_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698