Index: ash/wm/frame_painter.cc |
diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc |
index 45492df3a28d97c003a1ebf9600b1d7f3aa3ab7c..3528f35e13eadf12dbdbf31677166323b1a1e463 100644 |
--- a/ash/wm/frame_painter.cc |
+++ b/ash/wm/frame_painter.cc |
@@ -25,11 +25,11 @@ |
#include "ui/aura/env.h" |
#include "ui/aura/root_window.h" |
#include "ui/aura/window.h" |
-#include "ui/base/animation/slide_animation.h" |
#include "ui/base/hit_test.h" |
#include "ui/base/layout.h" |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/base/theme_provider.h" |
+#include "ui/gfx/animation/slide_animation.h" |
#include "ui/gfx/canvas.h" |
#include "ui/gfx/font.h" |
#include "ui/gfx/image/image.h" |
@@ -418,7 +418,7 @@ void FramePainter::PaintHeader(views::NonClientFrameView* view, |
parent->layer()->GetAnimator()->IsAnimatingProperty( |
ui::LayerAnimationElement::VISIBILITY)); |
if (!parent_animating) { |
- crossfade_animation_.reset(new ui::SlideAnimation(this)); |
+ crossfade_animation_.reset(new gfx::SlideAnimation(this)); |
crossfade_theme_frame_id_ = previous_theme_frame_id_; |
crossfade_theme_frame_overlay_id_ = previous_theme_frame_overlay_id_; |
crossfade_opacity_ = previous_opacity_; |
@@ -702,9 +702,9 @@ void FramePainter::OnWindowRemovingFromRootWindow(aura::Window* window) { |
} |
/////////////////////////////////////////////////////////////////////////////// |
-// ui::AnimationDelegate overrides: |
+// gfx::AnimationDelegate overrides: |
-void FramePainter::AnimationProgressed(const ui::Animation* animation) { |
+void FramePainter::AnimationProgressed(const gfx::Animation* animation) { |
frame_->non_client_view()->SchedulePaintInRect(header_frame_bounds_); |
} |