Move animation code to new ui/base/animation directory....

chrome/browser/ui/views/tabs/dragged_tab_controller.cc

 // Copyright (c) 2010 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/views/tabs/dragged_tab_controller.h"
 
 #include <math.h>
 #include <set>
 
-#include "app/animation.h"
-#include "app/animation_delegate.h"
-#include "app/slide_animation.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/base_tab.h"
 #include "chrome/browser/views/tabs/base_tab_strip.h"
 #include "chrome/browser/views/tabs/browser_tab_strip_controller.h"
 #include "chrome/browser/views/tabs/dragged_tab_view.h"
 #include "chrome/browser/views/tabs/native_view_photobooth.h"
 #include "chrome/browser/views/tabs/side_tab.h"
 #include "chrome/browser/views/tabs/side_tab_strip.h"
 #include "chrome/browser/views/tabs/tab.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_source.h"
 #include "gfx/canvas_skia.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/base/animation/animation.h"
+#include "ui/base/animation/animation_delegate.h"
+#include "ui/base/animation/slide_animation.h"
 #include "views/event.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
 #if defined(OS_WIN)
 #include "views/widget/widget_win.h"
 #endif
 
 #if defined(OS_LINUX)
@@ skipping 146 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 DraggedTabController::DockDisplayer : public AnimationDelegate {
+class DraggedTabController::DockDisplayer : public ui::AnimationDelegate {
  public:
   DockDisplayer(DraggedTabController* controller,
                 const DockInfo& info)
       : controller_(controller),
         popup_(NULL),
         popup_view_(NULL),
         ALLOW_THIS_IN_INITIALIZER_LIST(animation_(this)),
         hidden_(false),
         in_enable_area_(info.in_enable_area()) {
 #if defined(OS_WIN)
@@ skipping 45 matching lines @@
       return;
 
     if (!popup_) {
       delete this;
       return;
     }
     hidden_ = true;
     animation_.Hide();
   }
 
-  virtual void AnimationProgressed(const Animation* animation) {
+  virtual void AnimationProgressed(const ui::Animation* animation) {
     UpdateLayeredAlpha();
   }
 
-  virtual void AnimationEnded(const Animation* animation) {
+  virtual void AnimationEnded(const ui::Animation* animation) {
     if (!hidden_)
       return;
 #if defined(OS_WIN)
     static_cast<views::WidgetWin*>(popup_)->Close();
 #else
     NOTIMPLEMENTED();
 #endif
     delete this;
   }
 
@@ skipping 13 matching lines @@
   DraggedTabController* 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.
-  SlideAnimation animation_;
+  ui::SlideAnimation animation_;
 
   // Have we been hidden?
   bool hidden_;
 
   // Value of DockInfo::in_enable_area.
   bool in_enable_area_;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // DraggedTabController, public:
@@ skipping 1019 matching lines @@
 #else
     NOTIMPLEMENTED();
 #endif
   }
 }
 
 TabStripModel* DraggedTabController::GetModel(BaseTabStrip* tabstrip) const {
   return static_cast<BrowserTabStripController*>(tabstrip->controller())->
       model();
 }