| Index: base/synchronization/waitable_event_watcher.h
|
| diff --git a/base/synchronization/waitable_event_watcher.h b/base/synchronization/waitable_event_watcher.h
|
| index eb51effa49932cf250828a2ecc447f9a9c598e71..048020f2fa1b390fc1c0e409891e710ef962a646 100644
|
| --- a/base/synchronization/waitable_event_watcher.h
|
| +++ b/base/synchronization/waitable_event_watcher.h
|
| @@ -6,15 +6,10 @@
|
| #define BASE_SYNCHRONIZATION_WAITABLE_EVENT_WATCHER_H_
|
|
|
| #include "base/base_export.h"
|
| -#include "build/build_config.h"
|
| -
|
| -#if defined(OS_WIN)
|
| -#include "base/win/object_watcher.h"
|
| -#else
|
| #include "base/callback.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/synchronization/waitable_event.h"
|
| -#endif
|
| +#include "build/build_config.h"
|
|
|
| namespace base {
|
|
|
| @@ -59,11 +54,7 @@ class WaitableEvent;
|
| // it with a Watcher. It will act as if the event was never signaled.
|
|
|
| class BASE_EXPORT WaitableEventWatcher
|
| -#if defined(OS_WIN)
|
| - : public win::ObjectWatcher::Delegate {
|
| -#else
|
| : public MessageLoop::DestructionObserver {
|
| -#endif
|
| public:
|
| typedef Callback<void(WaitableEvent*)> EventCallback;
|
| WaitableEventWatcher();
|
| @@ -91,10 +82,6 @@ class BASE_EXPORT WaitableEventWatcher
|
| const EventCallback& callback() const { return callback_; }
|
|
|
| private:
|
| -#if defined(OS_WIN)
|
| - void OnObjectSignaled(HANDLE h) override;
|
| - win::ObjectWatcher watcher_;
|
| -#else
|
| // Implementation of MessageLoop::DestructionObserver
|
| void WillDestroyCurrentMessageLoop() override;
|
|
|
| @@ -103,7 +90,6 @@ class BASE_EXPORT WaitableEventWatcher
|
| AsyncWaiter* waiter_;
|
| base::Closure internal_callback_;
|
| scoped_refptr<WaitableEvent::WaitableEventKernel> kernel_;
|
| -#endif
|
|
|
| WaitableEvent* event_;
|
| EventCallback callback_;
|
|
|