summaryrefslogtreecommitdiffstats
path: root/ui/compositor
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-29 19:01:48 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-29 19:01:48 +0000
commit7060d65997d7b88b05137c70b1b509fbcafb0850 (patch)
treeb143e18a947e2b82990a077d8d5384ebf969f468 /ui/compositor
parentd10f82f6c62676297f2bb8f5908684f8ccdbaab8 (diff)
downloadchromium_src-7060d65997d7b88b05137c70b1b509fbcafb0850.zip
chromium_src-7060d65997d7b88b05137c70b1b509fbcafb0850.tar.gz
chromium_src-7060d65997d7b88b05137c70b1b509fbcafb0850.tar.bz2
ui: Use base::MessageLoop.
BUG=236029 R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/14061025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197100 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/compositor')
-rw-r--r--ui/compositor/compositor.cc2
-rw-r--r--ui/compositor/layer_unittest.cc5
-rw-r--r--ui/compositor/test/test_compositor_host_linux.cc2
-rw-r--r--ui/compositor/test/test_suite.cc2
4 files changed, 5 insertions, 6 deletions
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index 5943027..97d0b03 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -320,7 +320,7 @@ std::string Texture::Produce() {
CompositorLock::CompositorLock(Compositor* compositor)
: compositor_(compositor) {
- MessageLoop::current()->PostDelayedTask(
+ base::MessageLoop::current()->PostDelayedTask(
FROM_HERE,
base::Bind(&CompositorLock::CancelLock, AsWeakPtr()),
base::TimeDelta::FromMilliseconds(kCompositorLockTimeoutMs));
diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc
index 4f8b728..2631e9a 100644
--- a/ui/compositor/layer_unittest.cc
+++ b/ui/compositor/layer_unittest.cc
@@ -435,9 +435,8 @@ class LayerWithDelegateTest : public testing::Test, public CompositorDelegate {
virtual void ScheduleDraw() OVERRIDE {
DCHECK(!ui::Compositor::WasInitializedWithThread());
if (compositor_) {
- MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(&Compositor::Draw, compositor_->AsWeakPtr()));
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE, base::Bind(&Compositor::Draw, compositor_->AsWeakPtr()));
}
}
diff --git a/ui/compositor/test/test_compositor_host_linux.cc b/ui/compositor/test/test_compositor_host_linux.cc
index 463b9b2..18c2ac7 100644
--- a/ui/compositor/test/test_compositor_host_linux.cc
+++ b/ui/compositor/test/test_compositor_host_linux.cc
@@ -87,7 +87,7 @@ ui::Compositor* TestCompositorHostLinux::GetCompositor() {
void TestCompositorHostLinux::ScheduleDraw() {
DCHECK(!ui::Compositor::WasInitializedWithThread());
if (!method_factory_.HasWeakPtrs()) {
- MessageLoopForUI::current()->PostTask(
+ base::MessageLoopForUI::current()->PostTask(
FROM_HERE,
base::Bind(&TestCompositorHostLinux::Draw,
method_factory_.GetWeakPtr()));
diff --git a/ui/compositor/test/test_suite.cc b/ui/compositor/test/test_suite.cc
index 4340bfd..516cafc 100644
--- a/ui/compositor/test/test_suite.cc
+++ b/ui/compositor/test/test_suite.cc
@@ -36,7 +36,7 @@ void CompositorTestSuite::Initialize() {
gfx::RegisterPathProvider();
- message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI));
+ message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
CompositorTestSupport::Initialize();
Compositor::Initialize();
}