summaryrefslogtreecommitdiffstats
path: root/views
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 /views
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 'views')
-rw-r--r--views/controls/menu/menu_controller.cc2
-rw-r--r--views/controls/menu/nested_dispatcher_gtk.cc2
-rw-r--r--views/desktop/desktop_main.cc2
-rw-r--r--views/examples/examples_main.cc2
-rw-r--r--views/focus/focus_manager_unittest.cc16
-rw-r--r--views/widget/native_widget_gtk.cc2
6 files changed, 13 insertions, 13 deletions
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index a4b0d56..359cbb7 100644
--- a/views/controls/menu/menu_controller.cc
+++ b/views/controls/menu/menu_controller.cc
@@ -319,7 +319,7 @@ MenuItemView* MenuController::Run(Widget* parent,
MessageLoopForUI* loop = MessageLoopForUI::current();
bool did_allow_task_nesting = loop->NestableTasksAllowed();
loop->SetNestableTasksAllowed(true);
- loop->Run(this);
+ loop->RunWithDispatcher(this);
loop->SetNestableTasksAllowed(did_allow_task_nesting);
if (ViewsDelegate::views_delegate)
diff --git a/views/controls/menu/nested_dispatcher_gtk.cc b/views/controls/menu/nested_dispatcher_gtk.cc
index 383447c..688df9b 100644
--- a/views/controls/menu/nested_dispatcher_gtk.cc
+++ b/views/controls/menu/nested_dispatcher_gtk.cc
@@ -20,7 +20,7 @@ bool NestedDispatcherGtk::RunAndSelfDestruct() {
bool nestable = MessageLoopForUI::current()->NestableTasksAllowed();
if (allow_nested_task_)
MessageLoopForUI::current()->SetNestableTasksAllowed(true);
- MessageLoopForUI::current()->Run(this);
+ MessageLoopForUI::current()->RunWithDispatcher(this);
if (allow_nested_task_)
MessageLoopForUI::current()->SetNestableTasksAllowed(nestable);
bool creator_is_deleted = creator_ == NULL;
diff --git a/views/desktop/desktop_main.cc b/views/desktop/desktop_main.cc
index 225a970..f67d23e 100644
--- a/views/desktop/desktop_main.cc
+++ b/views/desktop/desktop_main.cc
@@ -82,7 +82,7 @@ int main(int argc, char** argv) {
gfx::Rect(600, 450, 450, 300), false);
views::AcceleratorHandler accelerator_handler;
- MessageLoopForUI::current()->Run(&accelerator_handler);
+ MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler);
#if defined(OS_WIN)
OleUninitialize();
diff --git a/views/examples/examples_main.cc b/views/examples/examples_main.cc
index 115bafc..15b5dfd 100644
--- a/views/examples/examples_main.cc
+++ b/views/examples/examples_main.cc
@@ -185,7 +185,7 @@ int main(int argc, char** argv) {
main.Init();
views::AcceleratorHandler accelerator_handler;
- MessageLoopForUI::current()->Run(&accelerator_handler);
+ MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler);
#if defined(OS_WIN)
OleUninitialize();
diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc
index 162468d..b2497e3 100644
--- a/views/focus/focus_manager_unittest.cc
+++ b/views/focus/focus_manager_unittest.cc
@@ -978,7 +978,7 @@ TEST_F(FocusManagerTest, FocusStoreRestore) {
view->RequestFocus();
RunPendingMessages();
- // MessageLoopForUI::current()->Run(new AcceleratorHandler());
+ // MessageLoopForUI::current()->RunWithDispatcher(new AcceleratorHandler());
// Visual Studio 2010 has problems converting NULL to the null pointer for
// std::pair. See http://connect.microsoft.com/VisualStudio/feedback/details/520043/error-converting-from-null-to-a-pointer-type-in-std-pair
@@ -1078,7 +1078,7 @@ TEST_F(FocusTraversalTest, NormalTraversal) {
// Uncomment the following line if you want to test manually the UI of this
// test.
- // MessageLoopForUI::current()->Run(new AcceleratorHandler());
+ // MessageLoopForUI::current()->RunWithDispatcher(new AcceleratorHandler());
// Let's traverse the whole focus hierarchy (several times, to make sure it
// loops OK).
@@ -1131,7 +1131,7 @@ TEST_F(FocusTraversalTest, TraversalWithNonEnabledViews) {
// Uncomment the following line if you want to test manually the UI of this
// test.
- // MessageLoopForUI::current()->Run(new AcceleratorHandler());
+ // MessageLoopForUI::current()->RunWithDispatcher(new AcceleratorHandler());
View* focused_view;
// Let's do one traversal (several times, to make sure it loops ok).
@@ -1183,7 +1183,7 @@ TEST_F(FocusTraversalTest, TraversalWithInvisibleViews) {
// Uncomment the following line if you want to test manually the UI of this
// test.
- // MessageLoopForUI::current()->Run(new AcceleratorHandler());
+ // MessageLoopForUI::current()->RunWithDispatcher(new AcceleratorHandler());
View* focused_view;
// Let's do one traversal (several times, to make sure it loops ok).
@@ -1514,7 +1514,7 @@ TEST_F(FocusManagerTest, IgnoreKeyupForAccelerators) {
PostKeyUp(ui::VKEY_9);
AcceleratorHandler accelerator_handler;
MessageLoopForUI::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
- MessageLoopForUI::current()->Run(&accelerator_handler);
+ MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler);
// Make sure we get a key-up and key-down.
ASSERT_EQ(1U, mtv->keys_pressed().size());
EXPECT_EQ(ui::VKEY_9, mtv->keys_pressed()[0]);
@@ -1533,7 +1533,7 @@ TEST_F(FocusManagerTest, IgnoreKeyupForAccelerators) {
PostKeyUp(ui::VKEY_7);
PostKeyUp(ui::VKEY_8);
MessageLoopForUI::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
- MessageLoopForUI::current()->Run(&accelerator_handler);
+ MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler);
// Make sure we get a key-up and key-down.
ASSERT_EQ(5U, mtv->keys_pressed().size());
EXPECT_EQ(ui::VKEY_9, mtv->keys_pressed()[0]);
@@ -1552,7 +1552,7 @@ TEST_F(FocusManagerTest, IgnoreKeyupForAccelerators) {
PostKeyDown(ui::VKEY_0);
PostKeyUp(ui::VKEY_0);
MessageLoopForUI::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
- MessageLoopForUI::current()->Run(&accelerator_handler);
+ MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler);
EXPECT_TRUE(mtv->keys_pressed().empty());
EXPECT_TRUE(mtv->keys_released().empty());
EXPECT_TRUE(mtv->accelerator_pressed());
@@ -1567,7 +1567,7 @@ TEST_F(FocusManagerTest, IgnoreKeyupForAccelerators) {
PostKeyUp(ui::VKEY_1);
PostKeyUp(ui::VKEY_0);
MessageLoopForUI::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
- MessageLoopForUI::current()->Run(&accelerator_handler);
+ MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler);
EXPECT_TRUE(mtv->keys_pressed().empty());
EXPECT_TRUE(mtv->keys_released().empty());
EXPECT_TRUE(mtv->accelerator_pressed());
diff --git a/views/widget/native_widget_gtk.cc b/views/widget/native_widget_gtk.cc
index b9995df..d344b1d 100644
--- a/views/widget/native_widget_gtk.cc
+++ b/views/widget/native_widget_gtk.cc
@@ -528,7 +528,7 @@ void NativeWidgetGtk::DoDrag(const OSExchangeData& data, int operation) {
drag_data_ = &data_provider;
// Block the caller until drag is done by running a nested message loop.
- MessageLoopForUI::current()->Run(NULL);
+ MessageLoopForUI::current()->RunWithDispatcher(NULL);
drag_data_ = NULL;