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

Side by Side Diff: trunk/src/base/message_loop/message_pump_x11.cc

Issue 238093002: Revert 263726 "x11: Remove X11 message-pump." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 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_x11.h" 5 #include "base/message_loop/message_pump_x11.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>
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 } 54 }
55 #else 55 #else
56 // static 56 // static
57 MessagePumpX11* MessagePumpX11::Current() { 57 MessagePumpX11* MessagePumpX11::Current() {
58 MessageLoopForUI* loop = MessageLoopForUI::current(); 58 MessageLoopForUI* loop = MessageLoopForUI::current();
59 return static_cast<MessagePumpX11*>(loop->pump_ui()); 59 return static_cast<MessagePumpX11*>(loop->pump_ui());
60 } 60 }
61 #endif 61 #endif
62 62
63 } // namespace base 63 } // namespace base
OLDNEW
« no previous file with comments | « trunk/src/base/message_loop/message_pump_x11.h ('k') | trunk/src/chrome/browser/ui/libgtk2ui/gtk2_event_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698