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 = |