Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(579)

Unified Diff: ui/aura/window.cc

Issue 8362006: Reland r107720 - Enable the new layer animation framework. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Enable framework for aura Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
« no previous file with comments | « ui/aura/window.h ('k') | ui/aura_shell/shell.cc » ('j') | ui/gfx/compositor/layer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698