summaryrefslogtreecommitdiffstats
path: root/ash/wm/window_animations_unittest.cc
diff options
context:
space:
mode:
authorshawnsingh@chromium.org <shawnsingh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-14 18:15:35 +0000
committershawnsingh@chromium.org <shawnsingh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-14 18:15:35 +0000
commit0f0453e90e6a85e469e138f048d2c1ae9a80e561 (patch)
treee60da12bc146144f88dea794b5e45c6785c7169e /ash/wm/window_animations_unittest.cc
parent4addcf3492db52c49f57d168d2bef07c46d411bd (diff)
downloadchromium_src-0f0453e90e6a85e469e138f048d2c1ae9a80e561.zip
chromium_src-0f0453e90e6a85e469e138f048d2c1ae9a80e561.tar.gz
chromium_src-0f0453e90e6a85e469e138f048d2c1ae9a80e561.tar.bz2
Migrate ui::Transform to gfx::Transform
It is more appropriate for Transform class to belong with its fellow geometry classes in the gfx namespace. Review URL: https://chromiumcodereview.appspot.com/11145005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161809 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_animations_unittest.cc')
-rw-r--r--ash/wm/window_animations_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/wm/window_animations_unittest.cc b/ash/wm/window_animations_unittest.cc
index dd316e8..ee6a1c9 100644
--- a/ash/wm/window_animations_unittest.cc
+++ b/ash/wm/window_animations_unittest.cc
@@ -169,13 +169,13 @@ TEST_F(WindowAnimationsTest, CrossFadeToBounds) {
// Original layer stays opaque and stretches to new size.
EXPECT_EQ(1.0f, old_layer->GetTargetOpacity());
EXPECT_EQ("5,10 320x240", old_layer->bounds().ToString());
- ui::Transform grow_transform;
+ gfx::Transform grow_transform;
grow_transform.ConcatScale(640.f / 320.f, 480.f / 240.f);
grow_transform.ConcatTranslate(-5.f, -10.f);
EXPECT_EQ(grow_transform, old_layer->GetTargetTransform());
// New layer animates in to the identity transform.
EXPECT_EQ(1.0f, window->layer()->GetTargetOpacity());
- EXPECT_EQ(ui::Transform(), window->layer()->GetTargetTransform());
+ EXPECT_EQ(gfx::Transform(), window->layer()->GetTargetTransform());
// Run the animations to completion.
static_cast<ui::AnimationContainerElement*>(old_layer->GetAnimator())->Step(
@@ -191,13 +191,13 @@ TEST_F(WindowAnimationsTest, CrossFadeToBounds) {
// Original layer fades out and stretches down to new size.
EXPECT_EQ(0.0f, old_layer->GetTargetOpacity());
EXPECT_EQ("0,0 640x480", old_layer->bounds().ToString());
- ui::Transform shrink_transform;
+ gfx::Transform shrink_transform;
shrink_transform.ConcatScale(320.f / 640.f, 240.f / 480.f);
shrink_transform.ConcatTranslate(5.f, 10.f);
EXPECT_EQ(shrink_transform, old_layer->GetTargetTransform());
// New layer animates in to the identity transform.
EXPECT_EQ(1.0f, window->layer()->GetTargetOpacity());
- EXPECT_EQ(ui::Transform(), window->layer()->GetTargetTransform());
+ EXPECT_EQ(gfx::Transform(), window->layer()->GetTargetTransform());
static_cast<ui::AnimationContainerElement*>(old_layer->GetAnimator())->Step(
base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1));