Chrome changes corresponding to my message_loop_type CL.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1363 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 16 insertions, 12 deletions

diff --git a/chrome/views/accelerator_handler.h b/chrome/views/accelerator_handler.h
index 093fc847..9405178 100644
--- a/chrome/views/accelerator_handler.h
+++ b/chrome/views/accelerator_handler.h
@@ -15,7 +15,7 @@ namespace ChromeViews {
 // holds a singleton instance of this class which can be used by other
 // custom message loop dispatcher objects to implement default accelerator
 // handling.
-class AcceleratorHandler : public MessageLoop::Dispatcher {
+class AcceleratorHandler : public MessageLoopForUI::Dispatcher {
  public:
    AcceleratorHandler();
   // Dispatcher method. This returns true if an accelerator was
diff --git a/chrome/views/chrome_menu.cc b/chrome/views/chrome_menu.cc
index 6fa61db..a1f9306 100644
--- a/chrome/views/chrome_menu.cc
+++ b/chrome/views/chrome_menu.cc
@@ -1550,14 +1550,14 @@ MenuItemView* MenuController::Run(HWND parent,
   DLOG(INFO) << " entering nested loop, depth=" << nested_depth;
 #endif
 
+  MessageLoopForUI* loop = MessageLoopForUI::current();
   if (MenuItemView::allow_task_nesting_during_run_) {
-    bool did_allow_task_nesting =
-        MessageLoop::current()->NestableTasksAllowed();
-    MessageLoop::current()->SetNestableTasksAllowed(true);
-    MessageLoop::current()->Run(this);
-    MessageLoop::current()->SetNestableTasksAllowed(did_allow_task_nesting);
+    bool did_allow_task_nesting = loop->NestableTasksAllowed();
+    loop->SetNestableTasksAllowed(true);
+    loop->Run(this);
+    loop->SetNestableTasksAllowed(did_allow_task_nesting);
   } else {
-    MessageLoop::current()->Run(this);
+    loop->Run(this);
   }
 
 #ifdef DEBUG_MENU
diff --git a/chrome/views/chrome_menu.h b/chrome/views/chrome_menu.h
index a1ed4ed..1377155 100644
--- a/chrome/views/chrome_menu.h
+++ b/chrome/views/chrome_menu.h
@@ -591,7 +591,7 @@ class SubmenuView : public View {
 // All relevant events are forwarded to the MenuController from SubmenuView
 // and MenuHost.
 
-class MenuController : public MessageLoop::Dispatcher {
+class MenuController : public MessageLoopForUI::Dispatcher {
  public:
   friend class MenuHostRootView;
   friend class MenuItemView;
diff --git a/chrome/views/focus_manager_unittest.cc b/chrome/views/focus_manager_unittest.cc
index c48879d..841f738 100644
--- a/chrome/views/focus_manager_unittest.cc
+++ b/chrome/views/focus_manager_unittest.cc
@@ -217,6 +217,7 @@ class FocusManagerTest : public testing::Test {
   virtual void SetUp();
   virtual void TearDown();
 
+  MessageLoopForUI message_loop_;
   TestViewWindow* test_window_;
 };
 
diff --git a/chrome/views/hwnd_view_container.cc b/chrome/views/hwnd_view_container.cc
index 204ba35..9c723d9 100644
--- a/chrome/views/hwnd_view_container.cc
+++ b/chrome/views/hwnd_view_container.cc
@@ -138,7 +138,7 @@ HWNDViewContainer::HWNDViewContainer()
 }
 
 HWNDViewContainer::~HWNDViewContainer() {
-  MessageLoop::current()->RemoveObserver(this);
+  MessageLoopForUI::current()->RemoveObserver(this);
 }
 
 void HWNDViewContainer::Init(HWND parent,
@@ -183,7 +183,7 @@ void HWNDViewContainer::Init(HWND parent,
   // Sets the RootView as a property, so the automation can introspect windows.
   SetRootViewForHWND(hwnd_, root_view_.get());
 
-  MessageLoop::current()->AddObserver(this);
+  MessageLoopForUI::current()->AddObserver(this);
 
   // Windows special DWM window frame requires a special tooltip manager so
   // that window controls in Chrome windows don't flicker when you move your
diff --git a/chrome/views/hwnd_view_container.h b/chrome/views/hwnd_view_container.h
index 6073b2d..026d6b7 100644
--- a/chrome/views/hwnd_view_container.h
+++ b/chrome/views/hwnd_view_container.h
@@ -75,7 +75,7 @@ class FillLayout : public LayoutManager {
 //
 ///////////////////////////////////////////////////////////////////////////////
 class HWNDViewContainer : public ViewContainer,
-                          public MessageLoop::Observer,
+                          public MessageLoopForUI::Observer,
                           public FocusTraversable,
                           public AcceleratorTarget {
  public:
diff --git a/chrome/views/native_scroll_bar.cc b/chrome/views/native_scroll_bar.cc
index bd81655..00e442c 100644
--- a/chrome/views/native_scroll_bar.cc
+++ b/chrome/views/native_scroll_bar.cc
@@ -190,7 +190,7 @@ class ScrollBarContainer : public CWindowImpl<ScrollBarContainer,
     MSG dummy;
     dummy.hwnd = NULL;
     dummy.message = 0;
-    MessageLoop::current()->DidProcessMessage(dummy);
+    MessageLoopForUI::current()->DidProcessMessage(dummy);
   }
 
   // note: always ignore 2nd param as it is 16 bits
diff --git a/chrome/views/view_unittest.cc b/chrome/views/view_unittest.cc
index 0034104..a658132 100644
--- a/chrome/views/view_unittest.cc
+++ b/chrome/views/view_unittest.cc
@@ -21,6 +21,9 @@ class ViewTest : public testing::Test {
   ~ViewTest() {
     OleUninitialize();
   }
+ 
+ private:
+  MessageLoopForUI message_loop_;
 };
 
 // Paints the RootView.