ui/views/animation/bounds_animator.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/views/animation/bounds_animator.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/views/animation/bounds_animator.cc

diff --git a/ui/views/animation/bounds_animator.cc b/ui/views/animation/bounds_animator.cc

index c064cc810f6443c5d8061381694e7311d2c909f0..839294ff74c410a34c2d0321abea54765ed093e9 100644

--- a/ui/views/animation/bounds_animator.cc

+++ b/ui/views/animation/bounds_animator.cc

@@ -5,18 +5,18 @@

#include "ui/views/animation/bounds_animator.h"

#include "base/memory/scoped_ptr.h"

-#include "ui/base/animation/animation_container.h"

-#include "ui/base/animation/slide_animation.h"

+#include "ui/gfx/animation/animation_container.h"

+#include "ui/gfx/animation/slide_animation.h"

#include "ui/views/animation/bounds_animator_observer.h"

#include "ui/views/view.h"

// Duration in milliseconds for animations.

static const int kDefaultAnimationDuration = 200;

-using ui::Animation;

-using ui::AnimationContainer;

-using ui::SlideAnimation;

-using ui::Tween;

+using gfx::Animation;

+using gfx::AnimationContainer;

+using gfx::SlideAnimation;

+using gfx::Tween;

namespace views {

« no previous file with comments | « ui/views/animation/bounds_animator.h ('k') | ui/views/animation/bounds_animator_unittest.cc » ('j') | no next file with comments »