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

ash/wm/maximize_bubble_controller.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/maximize_bubble_controller.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/workspace/frame_maximize_button.h"
 #include "base/timer/timer.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/aura/window.h"
-#include "ui/base/animation/animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/animation/animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/mouse_watcher.h"
@@ skipping 181 matching lines @@
                                          public views::MouseWatcherListener {
  public:
   explicit Bubble(MaximizeBubbleController* owner, int appearance_delay_ms_);
   virtual ~Bubble() {}
 
   // The window of the menu under which the SnapSizer will get created.
   aura::Window* GetBubbleWindow();
 
   // Overridden from views::BubbleDelegateView.
   virtual gfx::Rect GetAnchorRect() OVERRIDE;
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
   virtual bool CanActivate() const OVERRIDE { return false; }
 
   // Overridden from views::WidgetDelegateView.
   virtual bool WidgetHasHitTestMask() const OVERRIDE;
   virtual void GetWidgetHitTestMask(gfx::Path* mask) const OVERRIDE;
 
   // Implementation of MouseWatcherListener.
   virtual void MouseMovedOutOfHost() OVERRIDE;
 
   // Implementation of MouseWatcherHost.
@@ skipping 218 matching lines @@
 gfx::Rect MaximizeBubbleController::Bubble::GetAnchorRect() {
   if (!owner_)
     return gfx::Rect();
 
   gfx::Rect anchor_rect =
       owner_->frame_maximize_button()->GetBoundsInScreen();
   return anchor_rect;
 }
 
 void MaximizeBubbleController::Bubble::AnimationProgressed(
-    const ui::Animation* animation) {
+    const gfx::Animation* animation) {
   // First do everything needed for the fade by calling the base function.
   BubbleDelegateView::AnimationProgressed(animation);
   // When fading in we are done.
   if (!shutting_down_)
     return;
   // Upon fade out an additional shift is required.
   int shift = animation->CurrentValueBetween(kBubbleAnimationOffsetY, 0);
   gfx::Rect rect = initial_position_;
 
   rect.set_y(rect.y() + shift);
@@ skipping 384 matching lines @@
   if (!GetBoundsInScreen().Contains(screen_location))
     button_row_->ButtonHovered(NULL);
   else
     button_row_->ButtonHovered(this);
 
   // Pass the event on to the normal handler.
   return views::ImageButton::OnMouseDragged(event);
 }
 
 }  // namespace ash