Index: mojo/edk/system/simple_dispatcher.h |
diff --git a/mojo/edk/system/simple_dispatcher.h b/mojo/edk/system/simple_dispatcher.h |
index b1260ef2bcd248d1e5cce6bc110d7a56500337c5..eddf614e75c69e3aeb20e29a3a64b094bd6b658d 100644 |
--- a/mojo/edk/system/simple_dispatcher.h |
+++ b/mojo/edk/system/simple_dispatcher.h |
@@ -8,9 +8,9 @@ |
#include <list> |
#include "base/macros.h" |
+#include "mojo/edk/system/awakable_list.h" |
#include "mojo/edk/system/dispatcher.h" |
#include "mojo/edk/system/system_impl_export.h" |
-#include "mojo/edk/system/waiter_list.h" |
namespace mojo { |
namespace system { |
@@ -30,17 +30,17 @@ class MOJO_SYSTEM_IMPL_EXPORT SimpleDispatcher : public Dispatcher { |
void HandleSignalsStateChangedNoLock(); |
// |Dispatcher| protected methods: |
- void CancelAllWaitersNoLock() override; |
- MojoResult AddWaiterImplNoLock(Waiter* waiter, |
- MojoHandleSignals signals, |
- uint32_t context, |
- HandleSignalsState* signals_state) override; |
- void RemoveWaiterImplNoLock(Waiter* waiter, |
- HandleSignalsState* signals_state) override; |
+ void CancelAllAwakablesNoLock() override; |
+ MojoResult AddAwakableImplNoLock(Awakable* awakable, |
+ MojoHandleSignals signals, |
+ uint32_t context, |
+ HandleSignalsState* signals_state) override; |
+ void RemoveAwakableImplNoLock(Awakable* awakable, |
+ HandleSignalsState* signals_state) override; |
private: |
// Protected by |lock()|: |
- WaiterList waiter_list_; |
+ AwakableList awakable_list_; |
DISALLOW_COPY_AND_ASSIGN(SimpleDispatcher); |
}; |