ash/shelf/shelf_layout_manager.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: ash/shelf/shelf_layout_manager.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: ash/shelf/shelf_layout_manager.cc

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

index 84fef37d56675d892fe39102a8e48de23a00915c..0d94aa48c19d4c4b01aa87d1e49eb4e569163a55 100644

--- a/ash/shelf/shelf_layout_manager.cc

+++ b/ash/shelf/shelf_layout_manager.cc

@@ -663,12 +663,12 @@ void ShelfLayoutManager::UpdateBoundsAndOpacity(

if (animate) {

launcher_animation_setter.SetTransitionDuration(

base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS));

- launcher_animation_setter.SetTweenType(ui::Tween::EASE_OUT);

+ launcher_animation_setter.SetTweenType(gfx::Tween::EASE_OUT);

launcher_animation_setter.SetPreemptionStrategy(

ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);

status_animation_setter.SetTransitionDuration(

base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS));

- status_animation_setter.SetTweenType(ui::Tween::EASE_OUT);

+ status_animation_setter.SetTweenType(gfx::Tween::EASE_OUT);

status_animation_setter.SetPreemptionStrategy(

ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);

} else {

« no previous file with comments | « ash/shelf/overflow_button.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »