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

chrome/browser/ui/views/tabs/tab_drag_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 "chrome/browser/ui/views/tabs/tab_drag_controller.h"
 
 #include <math.h>
 #include <set>
 
 #include "base/auto_reset.h"
@@ skipping 18 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/theme_resources.h"
-#include "ui/base/animation/animation.h"
-#include "ui/base/animation/animation_delegate.h"
-#include "ui/base/animation/slide_animation.h"
 #include "ui/base/events/event_constants.h"
 #include "ui/base/events/event_utils.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/animation/animation.h"
+#include "ui/gfx/animation/animation_delegate.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #include "ash/wm/coordinate_conversion.h"
@@ skipping 174 matching lines @@
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // DockDisplayer
 
 // DockDisplayer is responsible for giving the user a visual indication of a
 // possible dock position (as represented by DockInfo). DockDisplayer shows
 // a window with a DockView in it. Two animations are used that correspond to
 // the state of DockInfo::in_enable_area.
-class TabDragController::DockDisplayer : public ui::AnimationDelegate {
+class TabDragController::DockDisplayer : public gfx::AnimationDelegate {
  public:
   DockDisplayer(TabDragController* controller, const DockInfo& info)
       : controller_(controller),
         popup_(NULL),
         popup_view_(NULL),
         animation_(this),
         hidden_(false),
         in_enable_area_(info.in_enable_area()) {
     popup_ = new views::Widget;
     views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
@@ skipping 39 matching lines @@
       return;
 
     if (!popup_) {
       delete this;
       return;
     }
     hidden_ = true;
     animation_.Hide();
   }
 
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE {
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE {
     UpdateLayeredAlpha();
   }
 
-  virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE {
+  virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE {
     if (!hidden_)
       return;
     popup_->Close();
     delete this;
   }
 
  private:
   void UpdateLayeredAlpha() {
     double scale = in_enable_area_ ? 1 : .5;
     popup_->SetOpacity(static_cast<unsigned char>(animation_.GetCurrentValue() *
         scale * 255.0));
   }
 
   // TabDragController that created us.
   TabDragController* controller_;
 
   // Window we're showing.
   views::Widget* popup_;
 
   // NativeView of |popup_|. We cache this to avoid the possibility of
   // invoking a method on popup_ after we close it.
   gfx::NativeView popup_view_;
 
   // Animation for when first made visible.
-  ui::SlideAnimation animation_;
+  gfx::SlideAnimation animation_;
 
   // Have we been hidden?
   bool hidden_;
 
   // Value of DockInfo::in_enable_area.
   bool in_enable_area_;
 };
 
 TabDragController::TabDragData::TabDragData()
     : contents(NULL),
@@ skipping 1845 matching lines @@
 gfx::Vector2d TabDragController::GetWindowOffset(
     const gfx::Point& point_in_screen) {
   TabStrip* owning_tabstrip = (attached_tabstrip_ && detach_into_browser_) ?
       attached_tabstrip_ : source_tabstrip_;
   views::View* toplevel_view = owning_tabstrip->GetWidget()->GetContentsView();
 
   gfx::Point point = point_in_screen;
   views::View::ConvertPointFromScreen(toplevel_view, &point);
   return point.OffsetFromOrigin();
 }