| 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_PUMP_GLIB_H_ | 5 #ifndef BASE_MESSAGE_LOOP_MESSAGE_PUMP_GLIB_H_ | 
| 6 #define BASE_MESSAGE_PUMP_GLIB_H_ | 6 #define BASE_MESSAGE_LOOP_MESSAGE_PUMP_GLIB_H_ | 
| 7 | 7 | 
| 8 #include "base/base_export.h" | 8 #include "base/base_export.h" | 
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" | 
| 10 #include "base/message_pump.h" | 10 #include "base/message_loop/message_pump.h" | 
| 11 #include "base/observer_list.h" | 11 #include "base/observer_list.h" | 
| 12 #include "base/time.h" | 12 #include "base/time.h" | 
| 13 | 13 | 
| 14 typedef struct _GMainContext GMainContext; | 14 typedef struct _GMainContext GMainContext; | 
| 15 typedef struct _GPollFD GPollFD; | 15 typedef struct _GPollFD GPollFD; | 
| 16 typedef struct _GSource GSource; | 16 typedef struct _GSource GSource; | 
| 17 | 17 | 
| 18 namespace base { | 18 namespace base { | 
| 19 | 19 | 
| 20 // MessagePumpObserver is notified prior to an event being dispatched. As | 20 // MessagePumpObserver is notified prior to an event being dispatched. As | 
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 100   scoped_ptr<GPollFD> wakeup_gpollfd_; | 100   scoped_ptr<GPollFD> wakeup_gpollfd_; | 
| 101 | 101 | 
| 102   // List of observers. | 102   // List of observers. | 
| 103   ObserverList<MessagePumpObserver> observers_; | 103   ObserverList<MessagePumpObserver> observers_; | 
| 104 | 104 | 
| 105   DISALLOW_COPY_AND_ASSIGN(MessagePumpGlib); | 105   DISALLOW_COPY_AND_ASSIGN(MessagePumpGlib); | 
| 106 }; | 106 }; | 
| 107 | 107 | 
| 108 }  // namespace base | 108 }  // namespace base | 
| 109 | 109 | 
| 110 #endif  // BASE_MESSAGE_PUMP_GLIB_H_ | 110 #endif  // BASE_MESSAGE_LOOP_MESSAGE_PUMP_GLIB_H_ | 
| OLD | NEW | 
|---|