ui/base/animation -> ui/gfx/animation

ash/wm/frame_painter.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/frame_painter.h"
 
 #include <vector>
 
 #include "ash/ash_constants.h"
 #include "ash/root_window_controller.h"
 #include "ash/root_window_settings.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_settings.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/frame_caption_button_container_view.h"
 #include "base/logging.h"  // DCHECK
 #include "grit/ash_resources.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/aura/client/aura_constants.h"
 #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"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 using aura::RootWindow;
 using aura::Window;
@@ skipping 368 matching lines @@
     // animating. Doing so results in continually painting during the animation
     // and gives a slower frame rate.
     // TODO(sky): expose a better way to determine this rather than assuming
     // the parent is a workspace.
     bool parent_animating = parent &&
         (parent->layer()->GetAnimator()->IsAnimatingProperty(
             ui::LayerAnimationElement::OPACITY) ||
          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_;
       crossfade_animation_->SetSlideDuration(kActivationCrossfadeDurationMs);
       crossfade_animation_->Show();
     } else {
       crossfade_animation_.reset();
     }
   }
 
@@ skipping 263 matching lines @@
 }
 
 void FramePainter::OnWindowRemovingFromRootWindow(aura::Window* window) {
   // Needs to trigger the window appearance change if the window moves across
   // root windows and only one window is left in the previous root.  Because
   // |window| is not yet moved, |window| has to be ignored.
   UpdateSoloWindowInRoot(window->GetRootWindow(), 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_);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // FramePainter, private:
 
 int FramePainter::GetTitleOffsetX() const {
   return window_icon_ ?
       window_icon_->bounds().right() + kTitleIconOffsetX :
       kTitleNoIconOffsetX;
@@ skipping 123 matching lines @@
   // icon. Don't use |window_icon_| for this computation as it may be NULL.
   int title_y = GetCaptionButtonContainerCenterY() - title_font.GetHeight() / 2;
   return gfx::Rect(
       title_x,
       std::max(0, title_y),
       std::max(0, caption_button_container_->x() - kTitleLogoSpacing - title_x),
       title_font.GetHeight());
 }
 
 }  // namespace ash