diff options
author | ajuma@chromium.org <ajuma@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-23 01:54:16 +0000 |
---|---|---|
committer | ajuma@chromium.org <ajuma@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-23 01:54:16 +0000 |
commit | bf91227ca2796661a6b17176dc50f4db002a7b49 (patch) | |
tree | eb055c21ce79191091dfb52422b958d1118b3840 /ash/rotator | |
parent | fe3b57cceb3381de3b8a9e83d52f6829c14317c0 (diff) | |
download | chromium_src-bf91227ca2796661a6b17176dc50f4db002a7b49.zip chromium_src-bf91227ca2796661a6b17176dc50f4db002a7b49.tar.gz chromium_src-bf91227ca2796661a6b17176dc50f4db002a7b49.tar.bz2 |
Thread ui opacity animations
BUG=164206
Review URL: https://chromiumcodereview.appspot.com/11896017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184254 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/rotator')
-rw-r--r-- | ash/rotator/screen_rotation.cc | 2 | ||||
-rw-r--r-- | ash/rotator/screen_rotation.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ash/rotator/screen_rotation.cc b/ash/rotator/screen_rotation.cc index 686bc89..2f0dc850 100644 --- a/ash/rotator/screen_rotation.cc +++ b/ash/rotator/screen_rotation.cc @@ -117,7 +117,7 @@ void ScreenRotation::OnGetTarget(TargetValue* target) const { target->transform = interpolated_transform_->Interpolate(1.0); } -void ScreenRotation::OnAbort() { +void ScreenRotation::OnAbort(ui::LayerAnimationDelegate* delegate) { } // static diff --git a/ash/rotator/screen_rotation.h b/ash/rotator/screen_rotation.h index 339b99f..2f9616a 100644 --- a/ash/rotator/screen_rotation.h +++ b/ash/rotator/screen_rotation.h @@ -43,7 +43,7 @@ class ASH_EXPORT ScreenRotation : public ui::LayerAnimationElement { virtual bool OnProgress(double t, ui::LayerAnimationDelegate* delegate) OVERRIDE; virtual void OnGetTarget(TargetValue* target) const OVERRIDE; - virtual void OnAbort() OVERRIDE; + virtual void OnAbort(ui::LayerAnimationDelegate* delegate) OVERRIDE; static const ui::LayerAnimationElement::AnimatableProperties& GetProperties(); |