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

Unified Diff: content/browser/web_contents/web_contents_view_aura.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
« no previous file with comments | « content/browser/web_contents/aura/window_slider.cc ('k') | ui/app_list/pagination_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_view_aura.cc
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index 90e2d77ab0c94ce89d468c6b55f86aef8550ab30..a965eda2a45932d65038e856bd36d9605eb8c2ab 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -935,7 +935,7 @@ void WebContentsViewAura::ResetOverscrollTransform() {
ui::ScopedLayerAnimationSettings settings(target->layer()->GetAnimator());
settings.SetPreemptionStrategy(
ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
- settings.SetTweenType(ui::Tween::EASE_OUT);
+ settings.SetTweenType(gfx::Tween::EASE_OUT);
settings.AddObserver(this);
target->SetTransform(gfx::Transform());
}
@@ -943,7 +943,7 @@ void WebContentsViewAura::ResetOverscrollTransform() {
ui::ScopedLayerAnimationSettings settings(target->layer()->GetAnimator());
settings.SetPreemptionStrategy(
ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
- settings.SetTweenType(ui::Tween::EASE_OUT);
+ settings.SetTweenType(gfx::Tween::EASE_OUT);
UpdateOverscrollWindowBrightness(0.f);
}
}
@@ -968,7 +968,7 @@ void WebContentsViewAura::CompleteOverscrollNavigation(OverscrollMode mode) {
ui::ScopedLayerAnimationSettings settings(target->layer()->GetAnimator());
settings.SetPreemptionStrategy(
ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
- settings.SetTweenType(ui::Tween::EASE_OUT);
+ settings.SetTweenType(gfx::Tween::EASE_OUT);
settings.AddObserver(this);
gfx::Transform transform;
int content_width =
« no previous file with comments | « content/browser/web_contents/aura/window_slider.cc ('k') | ui/app_list/pagination_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698