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

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

Issue 63443002: Revert 233414 "x11: Move XInput2 availability information out of..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month 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 | « no previous file | trunk/src/base/message_loop/message_pump_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 #ifndef BASE_MESSAGE_LOOP_MESSAGE_PUMP_X11_H 5 #ifndef BASE_MESSAGE_LOOP_MESSAGE_PUMP_X11_H
6 #define BASE_MESSAGE_LOOP_MESSAGE_PUMP_X11_H 6 #define BASE_MESSAGE_LOOP_MESSAGE_PUMP_X11_H
7 7
8 #include <bitset> 8 #include <bitset>
9 #include <map> 9 #include <map>
10 10
(...skipping 22 matching lines...) Expand all
33 // who have subscribed to messages from a specific X11 window. 33 // who have subscribed to messages from a specific X11 window.
34 class BASE_EXPORT MessagePumpX11 : public MessagePumpGlib, 34 class BASE_EXPORT MessagePumpX11 : public MessagePumpGlib,
35 public MessagePumpDispatcher { 35 public MessagePumpDispatcher {
36 public: 36 public:
37 MessagePumpX11(); 37 MessagePumpX11();
38 virtual ~MessagePumpX11(); 38 virtual ~MessagePumpX11();
39 39
40 // Returns default X Display. 40 // Returns default X Display.
41 static Display* GetDefaultXDisplay(); 41 static Display* GetDefaultXDisplay();
42 42
43 // Returns true if the system supports XINPUT2.
44 static bool HasXInput2();
45
43 // Returns the UI or GPU message pump. 46 // Returns the UI or GPU message pump.
44 static MessagePumpX11* Current(); 47 static MessagePumpX11* Current();
45 48
46 // Adds/Removes |dispatcher| for the |xid|. This will route all messages from 49 // Adds/Removes |dispatcher| for the |xid|. This will route all messages from
47 // the window |xid| to |dispatcher. 50 // the window |xid| to |dispatcher.
48 void AddDispatcherForWindow(MessagePumpDispatcher* dispatcher, 51 void AddDispatcherForWindow(MessagePumpDispatcher* dispatcher,
49 unsigned long xid); 52 unsigned long xid);
50 void RemoveDispatcherForWindow(unsigned long xid); 53 void RemoveDispatcherForWindow(unsigned long xid);
51 54
52 // Adds/Removes |dispatcher| to receive all events sent to the X root 55 // Adds/Removes |dispatcher| to receive all events sent to the X root
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 DISALLOW_COPY_AND_ASSIGN(MessagePumpX11); 125 DISALLOW_COPY_AND_ASSIGN(MessagePumpX11);
123 }; 126 };
124 127
125 #if !defined(TOOLKIT_GTK) 128 #if !defined(TOOLKIT_GTK)
126 typedef MessagePumpX11 MessagePumpForUI; 129 typedef MessagePumpX11 MessagePumpForUI;
127 #endif 130 #endif
128 131
129 } // namespace base 132 } // namespace base
130 133
131 #endif // BASE_MESSAGE_LOOP_MESSAGE_PUMP_X11_H 134 #endif // BASE_MESSAGE_LOOP_MESSAGE_PUMP_X11_H
OLDNEW
« no previous file with comments | « no previous file | trunk/src/base/message_loop/message_pump_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698