summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authoroshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-24 07:19:51 +0000
committeroshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-24 07:19:51 +0000
commit4d62853116b1f32e7aaa832c7988fb173eafac24 (patch)
tree3d43282a5b159b1659f650807822810881552368 /base
parent6e08414d4b8a1d0217118a282666add8ec0b777a (diff)
downloadchromium_src-4d62853116b1f32e7aaa832c7988fb173eafac24.zip
chromium_src-4d62853116b1f32e7aaa832c7988fb173eafac24.tar.gz
chromium_src-4d62853116b1f32e7aaa832c7988fb173eafac24.tar.bz2
rename Run in MessageLoopForUI to RunWithDispatcher
BUG=99471 TEST=none Review URL: http://codereview.chromium.org/8343023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/message_loop.cc2
-rw-r--r--base/message_loop.h2
-rw-r--r--base/message_loop_unittest.cc4
3 files changed, 4 insertions, 4 deletions
diff --git a/base/message_loop.cc b/base/message_loop.cc
index 45bad48..4cdcb24 100644
--- a/base/message_loop.cc
+++ b/base/message_loop.cc
@@ -833,7 +833,7 @@ void MessageLoopForUI::RemoveObserver(Observer* observer) {
pump_ui()->RemoveObserver(observer);
}
-void MessageLoopForUI::Run(Dispatcher* dispatcher) {
+void MessageLoopForUI::RunWithDispatcher(Dispatcher* dispatcher) {
AutoRunState save_state(this);
state_->dispatcher = dispatcher;
RunHandler();
diff --git a/base/message_loop.h b/base/message_loop.h
index adb58e3..732de03 100644
--- a/base/message_loop.h
+++ b/base/message_loop.h
@@ -623,7 +623,7 @@ class BASE_EXPORT MessageLoopForUI : public MessageLoop {
// methods.
void AddObserver(Observer* observer);
void RemoveObserver(Observer* observer);
- void Run(Dispatcher* dispatcher);
+ void RunWithDispatcher(Dispatcher* dispatcher);
void RunAllPendingWithDispatcher(Dispatcher* dispatcher);
protected:
diff --git a/base/message_loop_unittest.cc b/base/message_loop_unittest.cc
index 092f58a..7eb4f4a 100644
--- a/base/message_loop_unittest.cc
+++ b/base/message_loop_unittest.cc
@@ -1120,7 +1120,7 @@ void RunTest_Dispatcher(MessageLoop::Type message_loop_type) {
MessageLoop::current()->PostDelayedTask(FROM_HERE,
base::Bind(&MouseDownUp), 100);
DispatcherImpl dispatcher;
- MessageLoopForUI::current()->Run(&dispatcher);
+ MessageLoopForUI::current()->RunWithDispatcher(&dispatcher);
ASSERT_EQ(2, dispatcher.dispatch_count_);
}
@@ -1143,7 +1143,7 @@ void RunTest_DispatcherWithMessageHook(MessageLoop::Type message_loop_type) {
NULL,
GetCurrentThreadId());
DispatcherImpl dispatcher;
- MessageLoopForUI::current()->Run(&dispatcher);
+ MessageLoopForUI::current()->RunWithDispatcher(&dispatcher);
ASSERT_EQ(1, dispatcher.dispatch_count_);
UnhookWindowsHookEx(msg_hook);
}