ash/shelf/shelf_layout_manager_unittest.cc - Issue 291843012: compositor: Tick the UI animations from cc, instead of from timer callbacks.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/shelf/shelf_layout_manager_unittest.cc

Issue 291843012: compositor: Tick the UI animations from cc, instead of from timer callbacks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 6 years, 6 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: ash/shelf/shelf_layout_manager_unittest.cc

diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc

index 3a38fc0563f1e492d9b0e8e5cc8cba284910b170..dd5a35d89b65f77861d748f654e737d62fad2eee 100644

--- a/ash/shelf/shelf_layout_manager_unittest.cc

+++ b/ash/shelf/shelf_layout_manager_unittest.cc

@@ -34,7 +34,6 @@

#include "ui/compositor/layer_animator.h"

#include "ui/compositor/scoped_animation_duration_scale_mode.h"

#include "ui/events/gestures/gesture_configuration.h"

-#include "ui/gfx/animation/animation_container_element.h"

#include "ui/gfx/display.h"

#include "ui/gfx/screen.h"

#include "ui/views/controls/label.h"

@@ -50,10 +49,8 @@ namespace ash {

namespace {

void StepWidgetLayerAnimatorToEnd(views::Widget* widget) {

- gfx::AnimationContainerElement* element =

- static_cast<gfx::AnimationContainerElement*>(

- widget->GetNativeView()->layer()->GetAnimator());

- element->Step(base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1));

+ widget->GetNativeView()->layer()->GetAnimator()->Step(

+ base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1));

}

ShelfWidget* GetShelfWidget() {

« no previous file with comments | « ash/desktop_background/desktop_background_controller_unittest.cc ('k') | ash/wm/window_animations_unittest.cc » ('j') | no next file with comments »