ui/compositor/scoped_layer_animation_settings.cc - Issue 23531053: ui/base/animation -> ui/gfx/animation

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: ui/compositor/scoped_layer_animation_settings.cc

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge 2 trunk Created 7 years, 3 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:

Index: ui/compositor/scoped_layer_animation_settings.cc

diff --git a/ui/compositor/scoped_layer_animation_settings.cc b/ui/compositor/scoped_layer_animation_settings.cc

index c5ec4efb7322b4628b4d12ff1ec956585347f1d6..b5bad673f6074a318fe29e9b0cb37cf52d1b6aea 100644

--- a/ui/compositor/scoped_layer_animation_settings.cc

+++ b/ui/compositor/scoped_layer_animation_settings.cc

@@ -120,11 +120,11 @@ base::TimeDelta ScopedLayerAnimationSettings::GetTransitionDuration() const {

return animator_->transition_duration_;

}

-void ScopedLayerAnimationSettings::SetTweenType(Tween::Type tween_type) {

+void ScopedLayerAnimationSettings::SetTweenType(gfx::Tween::Type tween_type) {

animator_->set_tween_type(tween_type);

}

-Tween::Type ScopedLayerAnimationSettings::GetTweenType() const {

+gfx::Tween::Type ScopedLayerAnimationSettings::GetTweenType() const {

return animator_->tween_type();

}