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

Side by Side Diff: base/message_loop/message_pump_aurax11.cc

Issue 19224003: Use a direct include of the message_loop header in base/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 5 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 "base/message_loop/message_pump_aurax11.h" 5 #include "base/message_loop/message_pump_aurax11.h"
6 6
7 #include <glib.h> 7 #include <glib.h>
8 #include <X11/X.h> 8 #include <X11/X.h>
9 #include <X11/extensions/XInput2.h> 9 #include <X11/extensions/XInput2.h>
10 #include <X11/XKBlib.h> 10 #include <X11/XKBlib.h>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 14
15 namespace base { 15 namespace base {
16 16
17 namespace { 17 namespace {
18 18
19 gboolean XSourcePrepare(GSource* source, gint* timeout_ms) { 19 gboolean XSourcePrepare(GSource* source, gint* timeout_ms) {
20 if (XPending(MessagePumpAuraX11::GetDefaultXDisplay())) 20 if (XPending(MessagePumpAuraX11::GetDefaultXDisplay()))
21 *timeout_ms = 0; 21 *timeout_ms = 0;
22 else 22 else
23 *timeout_ms = -1; 23 *timeout_ms = -1;
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 if (FindEventTarget(xev) == x_root_window_) { 298 if (FindEventTarget(xev) == x_root_window_) {
299 FOR_EACH_OBSERVER(MessagePumpDispatcher, root_window_dispatchers_, 299 FOR_EACH_OBSERVER(MessagePumpDispatcher, root_window_dispatchers_,
300 Dispatch(xev)); 300 Dispatch(xev));
301 return true; 301 return true;
302 } 302 }
303 MessagePumpDispatcher* dispatcher = GetDispatcherForXEvent(xev); 303 MessagePumpDispatcher* dispatcher = GetDispatcherForXEvent(xev);
304 return dispatcher ? dispatcher->Dispatch(xev) : true; 304 return dispatcher ? dispatcher->Dispatch(xev) : true;
305 } 305 }
306 306
307 } // namespace base 307 } // namespace base
OLDNEW
« no previous file with comments | « base/message_loop/message_pump_aurax11.h ('k') | base/message_loop/message_pump_glib_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698