diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-15 17:29:30 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-15 17:29:30 +0000 |
| commit | ffb15d1eb8fc4180b30b43865fc44427f29cd578 (patch) | |
| tree | ea89569dc78f3a5a103dfb7eef8a4b5bc8879268 /ash/magnifier | |
| parent | 70cdf8d473698e4f9203dde64bfa9147dc4d70e7 (diff) | |
| download | chromium_src-ffb15d1eb8fc4180b30b43865fc44427f29cd578.zip chromium_src-ffb15d1eb8fc4180b30b43865fc44427f29cd578.tar.gz chromium_src-ffb15d1eb8fc4180b30b43865fc44427f29cd578.tar.bz2 | |
ui/base/animation -> ui/gfx/animation
I also made GFX_EXPORT real, which is ok since it's the same as
UI_EXPORT. It'll only matter when we separate out at gyp level.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/23531053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223289 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/magnifier')
| -rw-r--r-- | ash/magnifier/magnification_controller.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc index e796d182..02a2a8b 100644 --- a/ash/magnifier/magnification_controller.cc +++ b/ash/magnifier/magnification_controller.cc @@ -265,7 +265,7 @@ bool MagnificationControllerImpl::RedrawDIP(const gfx::PointF& position_in_dip, settings.AddObserver(this); settings.SetPreemptionStrategy( ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET); - settings.SetTweenType(ui::Tween::EASE_OUT); + settings.SetTweenType(gfx::Tween::EASE_OUT); settings.SetTransitionDuration( base::TimeDelta::FromMilliseconds(animate ? 100 : 0)); |