| Index: ui/aura/window.cc
|
| diff --git a/ui/aura/window.cc b/ui/aura/window.cc
|
| index 8b1a3967c5de3c05cbdc50a5b19ce1de50c7e113..bb3f36355a9a72772e79addd95fb56a29863addc 100644
|
| --- a/ui/aura/window.cc
|
| +++ b/ui/aura/window.cc
|
| @@ -410,12 +410,9 @@ bool Window::IsOrContainsFullscreenWindow() const {
|
| }
|
|
|
| // static
|
| -ui::Animation* Window::CreateDefaultAnimation() {
|
| - std::vector<ui::MultiAnimation::Part> parts;
|
| - parts.push_back(ui::MultiAnimation::Part(200, ui::Tween::LINEAR));
|
| - ui::MultiAnimation* multi_animation = new ui::MultiAnimation(parts);
|
| - multi_animation->set_continuous(false);
|
| - return multi_animation;
|
| +void Window::ApplyDefaultAnimationSettings(
|
| + ui::LayerAnimator::TransientSettings* settings) {
|
| + settings->SetTransitionDuration(base::TimeDelta::FromMilliseconds(200));
|
| }
|
|
|
| Desktop* Window::GetDesktop() {
|
| @@ -513,7 +510,8 @@ void Window::OnPaintLayer(gfx::Canvas* canvas) {
|
| delegate_->OnPaint(canvas);
|
| }
|
|
|
| -void Window::OnLayerAnimationEnded(const ui::Animation* animation) {
|
| +void Window::OnLayerAnimationEnded(
|
| + const ui::LayerAnimationSequence* animation) {
|
| }
|
|
|
| } // namespace aura
|
|
|