Index: base/message_loop/message_loop.h |
diff --git a/base/message_loop/message_loop.h b/base/message_loop/message_loop.h |
index f2f89d0574dc05f70102cc592fa0250860e13031..a6191e4d0587ac5547db98b25a40f8df0e2f7fe4 100644 |
--- a/base/message_loop/message_loop.h |
+++ b/base/message_loop/message_loop.h |
@@ -28,9 +28,7 @@ |
#include "base/tracking_info.h" |
// TODO(sky): these includes should not be necessary. Nuke them. |
-#if defined(OS_WIN) |
-#include "base/message_loop/message_pump_win.h" |
-#elif defined(OS_IOS) |
+#if defined(OS_IOS) |
#include "base/message_loop/message_pump_io_ios.h" |
#elif defined(OS_POSIX) |
#include "base/message_loop/message_pump_libevent.h" |
@@ -375,16 +373,6 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate { |
void AddTaskObserver(TaskObserver* task_observer); |
void RemoveTaskObserver(TaskObserver* task_observer); |
-#if defined(OS_WIN) |
- void set_os_modal_loop(bool os_modal_loop) { |
- os_modal_loop_ = os_modal_loop; |
- } |
- |
- bool os_modal_loop() const { |
- return os_modal_loop_; |
- } |
-#endif // OS_WIN |
- |
// Can only be called from the thread that owns the MessageLoop. |
bool is_running() const; |
@@ -482,16 +470,6 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate { |
// this queue is only accessed (push/pop) by our current thread. |
TaskQueue work_queue_; |
-#if defined(OS_WIN) |
- // How many high resolution tasks are in the pending task queue. This value |
- // increases by N every time we call ReloadWorkQueue() and decreases by 1 |
- // every time we call RunTask() if the task needs a high resolution timer. |
- int pending_high_res_tasks_; |
- // Tracks if we have requested high resolution timers. Its only use is to |
- // turn off the high resolution timer upon loop destruction. |
- bool in_high_res_mode_; |
-#endif |
- |
// Contains delayed tasks, sorted by their 'delayed_run_time' property. |
DelayedTaskQueue delayed_work_queue_; |
@@ -509,12 +487,6 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate { |
// insider a (accidentally induced?) nested message pump. |
bool nestable_tasks_allowed_; |
-#if defined(OS_WIN) |
- // Should be set to true before calling Windows APIs like TrackPopupMenu, etc |
- // which enter a modal message loop. |
- bool os_modal_loop_; |
-#endif |
- |
// pump_factory_.Run() is called to create a message pump for this loop |
// if type_ is TYPE_CUSTOM and pump_ is null. |
MessagePumpFactoryCallback pump_factory_; |
@@ -634,11 +606,7 @@ class BASE_EXPORT MessageLoopForIO : public MessageLoop { |
#if !defined(OS_NACL_SFI) |
-#if defined(OS_WIN) |
- typedef MessagePumpForIO::IOHandler IOHandler; |
- typedef MessagePumpForIO::IOContext IOContext; |
- typedef MessagePumpForIO::IOObserver IOObserver; |
-#elif defined(OS_IOS) |
+#if defined(OS_IOS) |
typedef MessagePumpIOSForIO::Watcher Watcher; |
typedef MessagePumpIOSForIO::FileDescriptorWatcher |
FileDescriptorWatcher; |
@@ -665,12 +633,7 @@ class BASE_EXPORT MessageLoopForIO : public MessageLoop { |
void AddIOObserver(IOObserver* io_observer); |
void RemoveIOObserver(IOObserver* io_observer); |
-#if defined(OS_WIN) |
- // Please see MessagePumpWin for definitions of these methods. |
- void RegisterIOHandler(HANDLE file, IOHandler* handler); |
- bool RegisterJobObject(HANDLE job, IOHandler* handler); |
- bool WaitForIOCompletion(DWORD timeout, IOHandler* filter); |
-#elif defined(OS_POSIX) |
+#if defined(OS_POSIX) |
// Please see MessagePumpIOSForIO/MessagePumpLibevent for definition. |
bool WatchFileDescriptor(int fd, |
bool persistent, |