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

Unified Diff: chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.mm

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/cocoa/constrained_window/constrained_window_animation.mm
diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.mm
index f408c5560f19c900a55445fef7973fa230e4dbb7..8d2f5c94fc4882ae727203b19c95d1660b272be0 100644
--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.mm
+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.mm
@@ -8,7 +8,7 @@
#include "base/location.h"
#import "base/mac/foundation_util.h"
#include "base/native_library.h"
-#include "ui/base/animation/tween.h"
+#include "ui/gfx/animation/tween.h"
// The window animations in this file use private APIs as described here:
// http://code.google.com/p/undocumented-goodness/source/browse/trunk/CoreGraphics/CGSPrivate.h
@@ -288,9 +288,9 @@ void UpdateWindowShowHideAnimationState(NSWindow* window, CGFloat value) {
if (value >= frames[i].value) {
CGFloat delta = frames[i + 1].value - frames[i].value;
CGFloat frame_progress = (value - frames[i].value) / delta;
- scale = ui::Tween::ValueBetween(frame_progress,
- frames[i].scale,
- frames[i + 1].scale);
+ scale = gfx::Tween::ValueBetween(frame_progress,
+ frames[i].scale,
+ frames[i + 1].scale);
break;
}
}
« no previous file with comments | « chrome/browser/ui/autofill/loading_animation.cc ('k') | chrome/browser/ui/cocoa/tabs/tab_audio_indicator_view_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698