| OLD | NEW | 
|---|
| 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 25 matching lines...) Expand all  Loading... | 
| 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. | 43   // Returns true if the system supports XINPUT2. | 
| 44   static bool HasXInput2(); | 44   static bool HasXInput2(); | 
| 45 | 45 | 
| 46 #if !defined(TOOLKIT_GTK) | 46   // Returns the UI or GPU message pump. | 
| 47   // Returns the UI message pump. |  | 
| 48   static MessagePumpX11* Current(); | 47   static MessagePumpX11* Current(); | 
| 49 #endif |  | 
| 50 | 48 | 
| 51   // 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 | 
| 52   // the window |xid| to |dispatcher. | 50   // the window |xid| to |dispatcher. | 
| 53   void AddDispatcherForWindow(MessagePumpDispatcher* dispatcher, | 51   void AddDispatcherForWindow(MessagePumpDispatcher* dispatcher, | 
| 54                               unsigned long xid); | 52                               unsigned long xid); | 
| 55   void RemoveDispatcherForWindow(unsigned long xid); | 53   void RemoveDispatcherForWindow(unsigned long xid); | 
| 56 | 54 | 
| 57   // 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 | 
| 58   // window. A root window can have multiple dispatchers, and events on root | 56   // window. A root window can have multiple dispatchers, and events on root | 
| 59   // windows will be dispatched to all. | 57   // windows will be dispatched to all. | 
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 127   DISALLOW_COPY_AND_ASSIGN(MessagePumpX11); | 125   DISALLOW_COPY_AND_ASSIGN(MessagePumpX11); | 
| 128 }; | 126 }; | 
| 129 | 127 | 
| 130 #if !defined(TOOLKIT_GTK) | 128 #if !defined(TOOLKIT_GTK) | 
| 131 typedef MessagePumpX11 MessagePumpForUI; | 129 typedef MessagePumpX11 MessagePumpForUI; | 
| 132 #endif | 130 #endif | 
| 133 | 131 | 
| 134 }  // namespace base | 132 }  // namespace base | 
| 135 | 133 | 
| 136 #endif  // BASE_MESSAGE_LOOP_MESSAGE_PUMP_X11_H | 134 #endif  // BASE_MESSAGE_LOOP_MESSAGE_PUMP_X11_H | 
| OLD | NEW | 
|---|