From 440e35732993c84fdb45e26f1eb8cb86945248b4 Mon Sep 17 00:00:00 2001 From: "sky@chromium.org" Date: Fri, 17 Jan 2014 00:10:29 +0000 Subject: Nukes MessageLoop::Dispatcher (2) There is no point in this typedef now that MessagePumpDispatcher is its own class. BUG=none TEST=none R=darin@chromium.org TBR=darin@chromium.org Review URL: https://codereview.chromium.org/135563004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245387 0039d316-1c4b-4281-b951-d872f2087c98 --- base/message_loop/message_loop.h | 5 +---- base/message_loop/message_loop_unittest.cc | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'base/message_loop') diff --git a/base/message_loop/message_loop.h b/base/message_loop/message_loop.h index 59c6cdc..74eddaf 100644 --- a/base/message_loop/message_loop.h +++ b/base/message_loop/message_loop.h @@ -25,9 +25,8 @@ #include "base/time/time.h" #include "base/tracking_info.h" +// TODO(sky): these includes should not be necessary. Nuke them. #if defined(OS_WIN) -// We need this to declare base::MessagePumpWin::Dispatcher, which we should -// really just eliminate. #include "base/message_loop/message_pump_win.h" #elif defined(OS_IOS) #include "base/message_loop/message_pump_io_ios.h" @@ -53,7 +52,6 @@ namespace base { class HistogramBase; -class MessagePumpDispatcher; class MessagePumpObserver; class RunLoop; class ThreadTaskRunnerHandle; @@ -97,7 +95,6 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate { public: #if defined(USE_AURA) - typedef MessagePumpDispatcher Dispatcher; typedef MessagePumpObserver Observer; #elif defined(USE_GTK_MESSAGE_PUMP) typedef MessagePumpGdkObserver Observer; diff --git a/base/message_loop/message_loop_unittest.cc b/base/message_loop/message_loop_unittest.cc index 64cf7c8..4a4949d 100644 --- a/base/message_loop/message_loop_unittest.cc +++ b/base/message_loop/message_loop_unittest.cc @@ -12,6 +12,7 @@ #include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop_proxy_impl.h" #include "base/message_loop/message_loop_test.h" +#include "base/message_loop/message_pump_dispatcher.h" #include "base/pending_task.h" #include "base/posix/eintr_wrapper.h" #include "base/run_loop.h" @@ -445,7 +446,7 @@ void PostNTasksThenQuit(int posts_remaining) { #if defined(OS_WIN) -class DispatcherImpl : public MessageLoopForUI::Dispatcher { +class DispatcherImpl : public MessagePumpDispatcher { public: DispatcherImpl() : dispatch_count_(0) {} -- cgit v1.1