| 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_AURAX11_H | 5 #ifndef BASE_MESSAGE_LOOP_MESSAGE_PUMP_AURAX11_H |
| 6 #define BASE_MESSAGE_LOOP_MESSAGE_PUMP_AURAX11_H | 6 #define BASE_MESSAGE_LOOP_MESSAGE_PUMP_AURAX11_H |
| 7 | 7 |
| 8 #include <bitset> | 8 #include <bitset> |
| 9 #include <map> | 9 #include <map> |
| 10 | 10 |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "base/message_loop/message_pump.h" | 12 #include "base/message_loop/message_pump.h" |
| 13 #include "base/message_loop/message_pump_dispatcher.h" | 13 #include "base/message_loop/message_pump_dispatcher.h" |
| 14 #include "base/message_loop/message_pump_glib.h" | 14 #include "base/message_loop/message_pump_glib.h" |
| 15 #include "base/message_loop/message_pump_observer.h" | 15 #include "base/message_loop/message_pump_observer.h" |
| 16 #include "base/observer_list.h" | 16 #include "base/observer_list.h" |
| 17 | 17 |
| 18 // It would be nice to include the X11 headers here so that we use Window | 18 // It would be nice to include the X11 headers here so that we use Window |
| 19 // instead of its typedef of unsigned long, but we can't because everything in | 19 // instead of its typedef of unsigned long, but we can't because everything in |
| 20 // chrome includes us through base/message_loop.h, and X11's crappy #define | 20 // chrome includes us through base/message_loop/message_loop.h, and X11's crappy |
| 21 // heavy headers muck up half of chrome. | 21 // #define heavy headers muck up half of chrome. |
| 22 | 22 |
| 23 typedef struct _GPollFD GPollFD; | 23 typedef struct _GPollFD GPollFD; |
| 24 typedef struct _GSource GSource; | 24 typedef struct _GSource GSource; |
| 25 typedef struct _XDisplay Display; | 25 typedef struct _XDisplay Display; |
| 26 | 26 |
| 27 namespace base { | 27 namespace base { |
| 28 | 28 |
| 29 // This class implements a message-pump for dispatching X events. | 29 // This class implements a message-pump for dispatching X events. |
| 30 // | 30 // |
| 31 // If there's a current dispatcher given through RunWithDispatcher(), that | 31 // If there's a current dispatcher given through RunWithDispatcher(), that |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 unsigned long x_root_window_; | 113 unsigned long x_root_window_; |
| 114 | 114 |
| 115 DISALLOW_COPY_AND_ASSIGN(MessagePumpAuraX11); | 115 DISALLOW_COPY_AND_ASSIGN(MessagePumpAuraX11); |
| 116 }; | 116 }; |
| 117 | 117 |
| 118 typedef MessagePumpAuraX11 MessagePumpForUI; | 118 typedef MessagePumpAuraX11 MessagePumpForUI; |
| 119 | 119 |
| 120 } // namespace base | 120 } // namespace base |
| 121 | 121 |
| 122 #endif // BASE_MESSAGE_LOOP_MESSAGE_PUMP_AURAX11_H | 122 #endif // BASE_MESSAGE_LOOP_MESSAGE_PUMP_AURAX11_H |
| OLD | NEW |