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

Unified Diff: chrome/browser/ui/autofill/loading_animation.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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/autofill/loading_animation.cc
diff --git a/chrome/browser/ui/autofill/loading_animation.cc b/chrome/browser/ui/autofill/loading_animation.cc
index 2420c768faf928f92a3204fc03710d8a690431fb..800ff3de8240b80c74c0aa492435724ead5a5c78 100644
--- a/chrome/browser/ui/autofill/loading_animation.cc
+++ b/chrome/browser/ui/autofill/loading_animation.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/ui/autofill/loading_animation.h"
#include "base/logging.h"
-#include "ui/base/animation/tween.h"
+#include "ui/gfx/animation/tween.h"
namespace autofill {
@@ -15,7 +15,7 @@ static const int kDurationMs = 1800;
// The frame rate of the animation.
static const int kHertz = 60;
-LoadingAnimation::LoadingAnimation(ui::AnimationDelegate* delegate)
+LoadingAnimation::LoadingAnimation(gfx::AnimationDelegate* delegate)
: LinearAnimation(kDurationMs, kHertz, delegate),
first_cycle_(true) {}
@@ -31,7 +31,7 @@ void LoadingAnimation::Step(base::TimeTicks time_now) {
}
double LoadingAnimation::GetCurrentValueForDot(size_t dot_i) {
- double base_value = ui::LinearAnimation::GetCurrentValue();
+ double base_value = gfx::LinearAnimation::GetCurrentValue();
const double kSecondDotDelayMs = 100.0;
const double kThirdDotDelayMs = 300.0;
@@ -43,7 +43,7 @@ double LoadingAnimation::GetCurrentValueForDot(size_t dot_i) {
if (base_value < 0.0)
base_value = first_cycle_ ? 0.0 : base_value + 1.0;
- double value = ui::Tween::CalculateValue(ui::Tween::EASE_OUT, base_value);
+ double value = gfx::Tween::CalculateValue(gfx::Tween::EASE_OUT, base_value);
static AnimationFrame animation_frames[] = {
{ 0.0, 0.0 },

Powered by Google App Engine
This is Rietveld 408576698