| Index: base/message_loop/message_loop.cc
|
| diff --git a/base/message_loop/message_loop.cc b/base/message_loop/message_loop.cc
|
| index 8991ff3a86f4fd7cce39fd4f32c439aed6d7ede3..421a6d26330a926970d1fad8fa298d21f26e8a4c 100644
|
| --- a/base/message_loop/message_loop.cc
|
| +++ b/base/message_loop/message_loop.cc
|
| @@ -46,13 +46,13 @@ MessageLoop::MessagePumpFactory* message_pump_for_ui_factory_ = NULL;
|
|
|
| #if defined(OS_IOS)
|
| typedef MessagePumpIOSForIO MessagePumpForIO;
|
| -#elif defined(OS_NACL_SFI)
|
| +#elif defined(OS_NACL_SFI) || defined(OS_FUCHSIA)
|
| typedef MessagePumpDefault MessagePumpForIO;
|
| #elif defined(OS_POSIX)
|
| typedef MessagePumpLibevent MessagePumpForIO;
|
| #endif
|
|
|
| -#if !defined(OS_NACL_SFI)
|
| +#if !defined(OS_NACL_SFI) && !defined(OS_FUCHSIA)
|
| MessagePumpForIO* ToPumpIO(MessagePump* pump) {
|
| return static_cast<MessagePumpForIO*>(pump);
|
| }
|
| @@ -168,7 +168,7 @@ std::unique_ptr<MessagePump> MessageLoop::CreateMessagePumpForType(Type type) {
|
|
|
| #if defined(OS_IOS) || defined(OS_MACOSX)
|
| #define MESSAGE_PUMP_UI std::unique_ptr<MessagePump>(MessagePumpMac::Create())
|
| -#elif defined(OS_NACL) || defined(OS_AIX)
|
| +#elif defined(OS_NACL) || defined(OS_AIX) || defined(OS_FUCHSIA)
|
| // Currently NaCl doesn't have a UI MessageLoop.
|
| // TODO(abarth): Figure out if we need this.
|
| #define MESSAGE_PUMP_UI std::unique_ptr<MessagePump>()
|
| @@ -631,7 +631,7 @@ bool MessageLoopForIO::RegisterJobObject(HANDLE job, IOHandler* handler) {
|
| bool MessageLoopForIO::WaitForIOCompletion(DWORD timeout, IOHandler* filter) {
|
| return ToPumpIO(pump_.get())->WaitForIOCompletion(timeout, filter);
|
| }
|
| -#elif defined(OS_POSIX)
|
| +#elif defined(OS_POSIX) && !defined(OS_FUCHSIA)
|
| bool MessageLoopForIO::WatchFileDescriptor(int fd,
|
| bool persistent,
|
| Mode mode,
|
|
|