Move *Animation to app/

http://crbug.com/11387

Review URL: http://codereview.chromium.org/109001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15275 0039d316-1c4b-4281-b951-d872f2087c98

35 files changed, 41 insertions, 778 deletions

diff --git a/chrome/browser/gtk/download_item_gtk.cc b/chrome/browser/gtk/download_item_gtk.cc
index ff65999..b3f4238 100644
--- a/chrome/browser/gtk/download_item_gtk.cc
+++ b/chrome/browser/gtk/download_item_gtk.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/gtk/download_item_gtk.h"
 
+#include "app/slide_animation.h"
 #include "base/basictypes.h"
 #include "base/string_util.h"
 #include "chrome/browser/download/download_item_model.h"
@@ -13,7 +14,6 @@
 #include "chrome/browser/gtk/nine_box.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/gfx/text_elider.h"
-#include "chrome/common/slide_animation.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
diff --git a/chrome/browser/gtk/download_item_gtk.h b/chrome/browser/gtk/download_item_gtk.h
index a57fcbb..e3cabb2 100644
--- a/chrome/browser/gtk/download_item_gtk.h
+++ b/chrome/browser/gtk/download_item_gtk.h
@@ -7,9 +7,9 @@
 
 #include <gtk/gtk.h>
 
+#include "app/animation.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/download/download_manager.h"
-#include "chrome/common/animation.h"
 
 class BaseDownloadItemModel;
 class DownloadShelfContextMenuGtk;
diff --git a/chrome/browser/gtk/slide_animator_gtk.cc b/chrome/browser/gtk/slide_animator_gtk.cc
index 684cc37..31d4d4c 100644
--- a/chrome/browser/gtk/slide_animator_gtk.cc
+++ b/chrome/browser/gtk/slide_animator_gtk.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/gtk/slide_animator_gtk.h"
 
+#include "app/animation.h"
+#include "app/slide_animation.h"
 #include "base/logging.h"
-#include "chrome/common/animation.h"
-#include "chrome/common/slide_animation.h"
 
 namespace {
 
diff --git a/chrome/browser/gtk/slide_animator_gtk.h b/chrome/browser/gtk/slide_animator_gtk.h
index 8c0db60..7d9fcb6 100644
--- a/chrome/browser/gtk/slide_animator_gtk.h
+++ b/chrome/browser/gtk/slide_animator_gtk.h
@@ -16,8 +16,8 @@
 
 #include <gtk/gtk.h>
 
+#include "app/animation.h"
 #include "base/scoped_ptr.h"
-#include "chrome/common/animation.h"
 #include "chrome/common/owned_widget_gtk.h"
 
 class SlideAnimation;
diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc
index 33627b6..75242fb 100644
--- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h"
 
 #include "app/resource_bundle.h"
+#include "app/slide_animation.h"
 #include "base/gfx/gtk_util.h"
 #include "base/gfx/point.h"
 #include "chrome/browser/browser.h"
@@ -12,7 +13,6 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/l10n_util.h"
-#include "chrome/common/slide_animation.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
diff --git a/chrome/browser/views/blocked_popup_container.h b/chrome/browser/views/blocked_popup_container.h
index 4a6fabe..214b8f8 100644
--- a/chrome/browser/views/blocked_popup_container.h
+++ b/chrome/browser/views/blocked_popup_container.h
@@ -13,10 +13,10 @@
 #include <utility>
 #include <vector>
 
+#include "app/animation.h"
 #include "base/gfx/rect.h"
 #include "chrome/browser/tab_contents/constrained_window.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
-#include "chrome/common/animation.h"
 #include "chrome/common/pref_member.h"
 #include "chrome/views/controls/button/button.h"
 #include "chrome/views/controls/menu/menu.h"
diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h
index f96c35a..53d5e68 100644
--- a/chrome/browser/views/bookmark_bar_view.h
+++ b/chrome/browser/views/bookmark_bar_view.h
@@ -5,11 +5,11 @@
 #ifndef CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_
 
+#include "app/slide_animation.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_menu_controller.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/extensions/extensions_service.h"
-#include "chrome/common/slide_animation.h"
 #include "chrome/views/controls/button/menu_button.h"
 #include "chrome/views/controls/label.h"
 #include "chrome/views/controls/menu/menu.h"
diff --git a/chrome/browser/views/download_item_view.h b/chrome/browser/views/download_item_view.h
index 730b425..06c344a 100644
--- a/chrome/browser/views/download_item_view.h
+++ b/chrome/browser/views/download_item_view.h
@@ -18,12 +18,12 @@
 
 #include <string>
 
+#include "app/slide_animation.h"
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "chrome/common/gfx/chrome_font.h"
-#include "chrome/common/slide_animation.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/icon_manager.h"
diff --git a/chrome/browser/views/download_shelf_view.h b/chrome/browser/views/download_shelf_view.h
index d73aa9f..5de3d34 100644
--- a/chrome/browser/views/download_shelf_view.h
+++ b/chrome/browser/views/download_shelf_view.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_VIEWS_DOWNLOAD_SHELF_VIEW_H_
 #define CHROME_BROWSER_VIEWS_DOWNLOAD_SHELF_VIEW_H_
 
+#include "app/slide_animation.h"
 #include "chrome/browser/download/download_shelf.h"
-#include "chrome/common/slide_animation.h"
 #include "chrome/views/controls/button/button.h"
 #include "chrome/views/controls/link.h"
 
diff --git a/chrome/browser/views/download_started_animation.h b/chrome/browser/views/download_started_animation.h
index bd8dec5..162560d 100644
--- a/chrome/browser/views/download_started_animation.h
+++ b/chrome/browser/views/download_started_animation.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_VIEWS_DOWNLOAD_STARTED_ANIMATION_H_
 #define CHROME_BROWSER_VIEWS_DOWNLOAD_STARTED_ANIMATION_H_
 
+#include "app/animation.h"
 #include "base/gfx/rect.h"
-#include "chrome/common/animation.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/views/controls/image_view.h"
 
diff --git a/chrome/browser/views/find_bar_win.h b/chrome/browser/views/find_bar_win.h
index 4f6cf31..ccdb497 100644
--- a/chrome/browser/views/find_bar_win.h
+++ b/chrome/browser/views/find_bar_win.h
@@ -5,10 +5,10 @@
 #ifndef CHROME_BROWSER_VIEWS_FIND_BAR_WIN_H_
 #define CHROME_BROWSER_VIEWS_FIND_BAR_WIN_H_
 
+#include "app/animation.h"
 #include "base/gfx/rect.h"
 #include "chrome/browser/find_bar.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
-#include "chrome/common/animation.h"
 #include "chrome/views/widget/widget_win.h"
 
 class BrowserView;
diff --git a/chrome/browser/views/fullscreen_exit_bubble.h b/chrome/browser/views/fullscreen_exit_bubble.h
index 7e354bd..59825d3 100644
--- a/chrome/browser/views/fullscreen_exit_bubble.h
+++ b/chrome/browser/views/fullscreen_exit_bubble.h
@@ -5,9 +5,9 @@
 #ifndef CHROME_BROWSER_VIEWS_FULLSCREEN_EXIT_BUBBLE_H__
 #define CHROME_BROWSER_VIEWS_FULLSCREEN_EXIT_BUBBLE_H__
 
+#include "app/slide_animation.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/command_updater.h"
-#include "chrome/common/slide_animation.h"
 #include "chrome/views/controls/link.h"
 #include "chrome/views/widget/widget_win.h"
 
diff --git a/chrome/browser/views/info_bubble.h b/chrome/browser/views/info_bubble.h
index a837af8..235a2b6 100644
--- a/chrome/browser/views/info_bubble.h
+++ b/chrome/browser/views/info_bubble.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_VIEWS_INFO_BUBBLE_H_
 #define CHROME_BROWSER_VIEWS_INFO_BUBBLE_H_
 
-#include "chrome/common/slide_animation.h"
+#include "app/slide_animation.h"
 #include "chrome/views/view.h"
 #include "chrome/views/widget/widget_win.h"
 
diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc
index fd61ba6..c4a0618 100644
--- a/chrome/browser/views/infobars/infobars.cc
+++ b/chrome/browser/views/infobars/infobars.cc
@@ -5,12 +5,12 @@
 #include "chrome/browser/views/infobars/infobars.h"
 
 #include "app/resource_bundle.h"
+#include "app/slide_animation.h"
 #include "base/message_loop.h"
 #include "chrome/browser/views/event_utils.h"
 #include "chrome/browser/views/infobars/infobar_container.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/l10n_util.h"
-#include "chrome/common/slide_animation.h"
 #include "chrome/views/background.h"
 #include "chrome/views/controls/button/image_button.h"
 #include "chrome/views/controls/button/native_button.h"
diff --git a/chrome/browser/views/infobars/infobars.h b/chrome/browser/views/infobars/infobars.h
index 7b5feae..2daefa9 100644
--- a/chrome/browser/views/infobars/infobars.h
+++ b/chrome/browser/views/infobars/infobars.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_VIEWS_INFOBARS_INFOBARS_H_
 #define CHROME_BROWSER_VIEWS_INFOBARS_INFOBARS_H_
 
+#include "app/animation.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
-#include "chrome/common/animation.h"
 #include "chrome/views/controls/button/button.h"
 #include "chrome/views/controls/link.h"
 
diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc
index 2426bf1..002cf7f 100644
--- a/chrome/browser/views/status_bubble_views.cc
+++ b/chrome/browser/views/status_bubble_views.cc
@@ -6,9 +6,9 @@
 
 #include <algorithm>
 
+#include "app/animation.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
-#include "chrome/common/animation.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/text_elider.h"
 #include "chrome/common/l10n_util.h"
diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc
index 8df9a38..370a170 100644
--- a/chrome/browser/views/tabs/dragged_tab_controller.cc
+++ b/chrome/browser/views/tabs/dragged_tab_controller.cc
@@ -7,6 +7,7 @@
 #include <math.h>
 #include <set>
 
+#include "app/animation.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
@@ -18,7 +19,6 @@
 #include "chrome/browser/views/tabs/tab.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/animation.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/views/event.h"
diff --git a/chrome/browser/views/tabs/dragged_tab_view.h b/chrome/browser/views/tabs/dragged_tab_view.h
index fb26254..5802ec2 100644
--- a/chrome/browser/views/tabs/dragged_tab_view.h
+++ b/chrome/browser/views/tabs/dragged_tab_view.h
@@ -5,10 +5,10 @@
 #ifndef CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_VIEW_H_
 #define CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_VIEW_H_
 
+#include "app/slide_animation.h"
 #include "base/gfx/point.h"
 #include "base/gfx/size.h"
 #include "base/task.h"
-#include "chrome/common/slide_animation.h"
 #include "chrome/views/view.h"
 #include "skia/include/SkBitmap.h"
 
diff --git a/chrome/browser/views/tabs/tab_renderer.h b/chrome/browser/views/tabs/tab_renderer.h
index 2f456e4..67c4639 100644
--- a/chrome/browser/views/tabs/tab_renderer.h
+++ b/chrome/browser/views/tabs/tab_renderer.h
@@ -5,10 +5,10 @@
 #ifndef CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_H__
 #define CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_H__
 
+#include "app/animation.h"
+#include "app/slide_animation.h"
+#include "app/throb_animation.h"
 #include "base/gfx/point.h"
-#include "chrome/common/animation.h"
-#include "chrome/common/slide_animation.h"
-#include "chrome/common/throb_animation.h"
 #include "chrome/views/controls/button/image_button.h"
 #include "chrome/views/controls/menu/menu.h"
 #include "chrome/views/view.h"
diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc
index 0543628..9d301f0 100644
--- a/chrome/browser/views/tabs/tab_strip.cc
+++ b/chrome/browser/views/tabs/tab_strip.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/views/tabs/tab_strip.h"
 
 #include "app/resource_bundle.h"
+#include "app/slide_animation.h"
 #include "base/gfx/size.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ -21,7 +22,6 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/os_exchange_data.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/common/slide_animation.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/controls/image_view.h"
 #include "chrome/views/painter.h"
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index b0ff177..2999cf3 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -124,11 +124,17 @@
       ],
       'sources': [
         # All .cc, .h, and .mm files under app/ except for tests.
+        '../app/animation.cc',
+        '../app/animation.h',
         '../app/resource_bundle.cc',
         '../app/resource_bundle.h',
         '../app/resource_bundle_win.cc',
         '../app/resource_bundle_linux.cc',
         '../app/resource_bundle_mac.mm',
+        '../app/slide_animation.cc',
+        '../app/slide_animation.h',
+        '../app/throb_animation.cc',
+        '../app/throb_animation.h',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
@@ -236,8 +242,6 @@
         'common/net/url_request_intercept_job.cc',
         'common/net/url_request_intercept_job.h',
         'common/accessibility_types.h',
-        'common/animation.cc',
-        'common/animation.h',
         'common/app_cache/app_cache_context_impl.cc',
         'common/app_cache/app_cache_context_impl.h',
         'common/app_cache/app_cache_dispatcher.cc',
@@ -374,8 +378,6 @@
         'common/sandbox_init_wrapper.h',
         'common/security_filter_peer.cc',
         'common/security_filter_peer.h',
-        'common/slide_animation.cc',
-        'common/slide_animation.h',
         'common/sqlite_compiled_statement.cc',
         'common/sqlite_compiled_statement.h',
         'common/sqlite_utils.cc',
@@ -384,8 +386,6 @@
         'common/task_queue.h',
         'common/temp_scaffolding_stubs.cc',
         'common/temp_scaffolding_stubs.h',
-        'common/throb_animation.cc',
-        'common/throb_animation.h',
         'common/thumbnail_score.cc',
         'common/thumbnail_score.h',
         'common/time_format.cc',
diff --git a/chrome/common/animation.cc b/chrome/common/animation.cc
deleted file mode 100644
index 0898935..0000000
--- a/chrome/common/animation.cc
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright (c) 2006-2008 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 "base/message_loop.h"
-#include "chrome/common/animation.h"
-
-using base::TimeDelta;
-
-Animation::Animation(int frame_rate,
-                     AnimationDelegate* delegate)
-  : animating_(false),
-    frame_rate_(frame_rate),
-    timer_interval_(CalculateInterval(frame_rate)),
-    duration_(0),
-    iteration_count_(0),
-    current_iteration_(0),
-    state_(0.0),
-    delegate_(delegate) {
-}
-
-Animation::Animation(int duration,
-                     int frame_rate,
-                     AnimationDelegate* delegate)
-  : animating_(false),
-    frame_rate_(frame_rate),
-    timer_interval_(CalculateInterval(frame_rate)),
-    duration_(0),
-    iteration_count_(0),
-    current_iteration_(0),
-    state_(0.0),
-    delegate_(delegate) {
-
-  SetDuration(duration);
-}
-
-Animation::~Animation() {
-}
-
-void Animation::Reset() {
-  current_iteration_ = 0;
-}
-
-double Animation::GetCurrentValue() const {
-  // Default is linear relationship, subclass to adapt.
-  return state_;
-}
-
-void Animation::Start() {
-  if (!animating_) {
-    timer_.Start(TimeDelta::FromMilliseconds(timer_interval_), this,
-                 &Animation::Run);
-
-    animating_ = true;
-    if (delegate_)
-      delegate_->AnimationStarted(this);
-  }
-}
-
-void Animation::Stop() {
-  if (animating_) {
-    timer_.Stop();
-
-    animating_ = false;
-    if (delegate_) {
-      if (state_ >= 1.0)
-        delegate_->AnimationEnded(this);
-      else
-        delegate_->AnimationCanceled(this);
-    }
-  }
-}
-
-void Animation::End() {
-  if (animating_) {
-    timer_.Stop();
-
-    animating_ = false;
-    AnimateToState(1.0);
-    if (delegate_)
-      delegate_->AnimationEnded(this);
-  }
-}
-
-bool Animation::IsAnimating() {
-  return animating_;
-}
-
-void Animation::SetDuration(int duration) {
-  duration_ = duration;
-  if (duration_ < timer_interval_)
-    duration_ = timer_interval_;
-  iteration_count_ = duration_ / timer_interval_;
-
-  // Changing the number of iterations forces us to reset the
-  // animation to the first iteration.
-  current_iteration_ = 0;
-}
-
-void Animation::Step() {
-  state_ = static_cast<double>(++current_iteration_) / iteration_count_;
-
-  if (state_ >= 1.0)
-    state_ = 1.0;
-
-  AnimateToState(state_);
-  if (delegate_)
-    delegate_->AnimationProgressed(this);
-
-  if (state_ == 1.0)
-    Stop();
-}
-
-void Animation::Run() {
-  Step();
-}
-
-int Animation::CalculateInterval(int frame_rate) {
-  int timer_interval = 1000 / frame_rate;
-  if (timer_interval < 10)
-    timer_interval = 10;
-  return timer_interval;
-}
diff --git a/chrome/common/animation.h b/chrome/common/animation.h
deleted file mode 100644
index 1771b16..0000000
--- a/chrome/common/animation.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright (c) 2006-2008 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.
-// Inspired by NSAnimation
-
-#ifndef CHROME_COMMON_ANIMATION_H__
-#define CHROME_COMMON_ANIMATION_H__
-
-#include "base/timer.h"
-
-class Animation;
-
-// AnimationDelegate
-//
-//  Implement this interface when you want to receive notifications about the
-//  state of an animation.
-//
-class AnimationDelegate {
- public:
-  // Called when an animation has started.
-  virtual void AnimationStarted(const Animation* animation) {
-  }
-
-  // Called when an animation has completed.
-  virtual void AnimationEnded(const Animation* animation) {
-  }
-
-  // Called when an animation has progressed.
-  virtual void AnimationProgressed(const Animation* animation) {
-  }
-
-  // Called when an animation has been canceled.
-  virtual void AnimationCanceled(const Animation* animation) {
-  }
-};
-
-// Animation
-//
-//  This class provides a basic implementation of an object that uses a timer
-//  to increment its state over the specified time and frame-rate. To
-//  actually do something useful with this you need to subclass it and override
-//  AnimateToState and optionally GetCurrentValue to update your state.
-//
-//  The Animation notifies a delegate when events of interest occur.
-//
-//  The practice is to instantiate a subclass and call Init and any other
-//  initialization specific to the subclass, and then call |Start|. The
-//  animation uses the current thread's message loop.
-//
-class Animation {
- public:
-  // Initializes everything except the duration.
-  //
-  // Caller must make sure to call SetDuration() if they use this
-  // constructor; it is preferable to use the full one, but sometimes
-  // duration can change between calls to Start() and we need to
-  // expose this interface.
-  Animation(int frame_rate, AnimationDelegate* delegate);
-
-  // Initializes all fields.
-  Animation(int duration, int frame_rate, AnimationDelegate* delegate);
-  virtual ~Animation();
-
-  // Reset state so that the animation can be started again.
-  virtual void Reset();
-
-  // Called when the animation progresses. Subclasses override this to
-  // efficiently update their state.
-  virtual void AnimateToState(double state) = 0;
-
-  // Gets the value for the current state, according to the animation
-  // curve in use. This class provides only for a linear relationship,
-  // however subclasses can override this to provide others.
-  virtual double GetCurrentValue() const;
-
-  // Start the animation.
-  void Start();
-
-  // Stop the animation.
-  void Stop();
-
-  // Skip to the end of the current animation.
-  void End();
-
-  // Return whether this animation is animating.
-  bool IsAnimating();
-
-  // Changes the length of the animation. This resets the current
-  // state of the animation to the beginning.
-  void SetDuration(int duration);
-
- protected:
-  // Overriddable, called by Run.
-  virtual void Step();
-
-  // Calculates the timer interval from the constructor list.
-  int CalculateInterval(int frame_rate);
-
-  // Whether or not we are currently animating.
-  bool animating_;
-
-  int frame_rate_;
-  int timer_interval_;
-  int duration_;
-
-  // For determining state.
-  int iteration_count_;
-  int current_iteration_;
-  double state_;
-
-  AnimationDelegate* delegate_;
-
-  base::RepeatingTimer<Animation> timer_;
-
- private:
-  // Called when the animation's timer expires, calls Step.
-  void Run();
-
-  DISALLOW_EVIL_CONSTRUCTORS(Animation);
-};
-
-#endif  // CHROME_COMMON_ANIMATION_H__
diff --git a/chrome/common/animation_unittest.cc b/chrome/common/animation_unittest.cc
deleted file mode 100644
index 6ca19e4..0000000
--- a/chrome/common/animation_unittest.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (c) 2006-2008 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 "base/message_loop.h"
-#include "chrome/common/animation.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-using namespace std;
-
-class AnimationTest: public testing::Test {
- private:
-  MessageLoopForUI message_loop_;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// RunAnimation
-
-class RunAnimation : public Animation {
- public:
-  RunAnimation(int frame_rate, AnimationDelegate* delegate)
-      : Animation(frame_rate, delegate) {
-  }
-
-  virtual void AnimateToState(double state) {
-    EXPECT_LE(0.0, state);
-    EXPECT_GE(1.0, state);
-  }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// CancelAnimation
-
-class CancelAnimation : public Animation {
- public:
-  CancelAnimation(int duration, int frame_rate, AnimationDelegate* delegate)
-      : Animation(duration, frame_rate, delegate) {
-  }
-
-  virtual void AnimateToState(double state) {
-    if (state >= 0.5)
-      Stop();
-  }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// LinearCase
-
-class TestAnimationDelegate : public AnimationDelegate {
- public:
-  TestAnimationDelegate() :
-    canceled_(false),
-    finished_(false) {
-  }
-
-  virtual void AnimationStarted(const Animation* animation) {
-  }
-
-  virtual void AnimationEnded(const Animation* animation) {
-    finished_ = true;
-    MessageLoop::current()->Quit();
-  }
-
-  virtual void AnimationCanceled(const Animation* animation) {
-    finished_ = true;
-    canceled_ = true;
-    MessageLoop::current()->Quit();
-  }
-
-  bool finished() {
-    return finished_;
-  }
-
-  bool canceled() {
-    return canceled_;
-  }
-
- private:
-  bool canceled_;
-  bool finished_;
-};
-
-TEST_F(AnimationTest, RunCase) {
-  TestAnimationDelegate ad;
-  RunAnimation a1(150, &ad);
-  a1.SetDuration(2000);
-  a1.Start();
-  MessageLoop::current()->Run();
-
-  EXPECT_TRUE(ad.finished());
-  EXPECT_FALSE(ad.canceled());
-}
-
-TEST_F(AnimationTest, CancelCase) {
-  TestAnimationDelegate ad;
-  CancelAnimation a2(2000, 150, &ad);
-  a2.Start();
-  MessageLoop::current()->Run();
-
-  EXPECT_TRUE(ad.finished());
-  EXPECT_TRUE(ad.canceled());
-}
diff --git a/chrome/common/common.vcproj b/chrome/common/common.vcproj
index bbc24d2..27db826 100644
--- a/chrome/common/common.vcproj
+++ b/chrome/common/common.vcproj
@@ -362,14 +362,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\animation.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\animation.h"
-			>
-		</File>
-		<File
 			RelativePath=".\bindings_policy.h"
 			>
 		</File>
@@ -754,14 +746,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\slide_animation.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\slide_animation.h"
-			>
-		</File>
-		<File
 			RelativePath=".\sqlite_compiled_statement.cc"
 			>
 		</File>
@@ -786,14 +770,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\throb_animation.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\throb_animation.h"
-			>
-		</File>
-		<File
 			RelativePath=".\thumbnail_score.cc"
 			>
 		</File>
diff --git a/chrome/common/slide_animation.cc b/chrome/common/slide_animation.cc
deleted file mode 100644
index ffcb656..0000000
--- a/chrome/common/slide_animation.cc
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (c) 2006-2008 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/common/slide_animation.h"
-
-#include <math.h>
-
-// How many frames per second to target.
-static const int kDefaultFramerateHz = 50;
-
-// How long animations should take by default.
-static const int kDefaultDurationMs = 120;
-
-SlideAnimation::SlideAnimation(AnimationDelegate* target)
-    : Animation(kDefaultFramerateHz, target),
-      target_(target),
-      tween_type_(EASE_OUT),
-      showing_(false),
-      value_start_(0),
-      value_end_(0),
-      value_current_(0),
-      slide_duration_(kDefaultDurationMs) {
-}
-
-SlideAnimation::~SlideAnimation() {
-}
-
-void SlideAnimation::Reset() {
-  Reset(0);
-}
-
-void SlideAnimation::Reset(double value) {
-  Stop();
-  showing_ = static_cast<bool>(value == 1);
-  value_current_ = value;
-}
-
-void SlideAnimation::Show() {
-  // If we're already showing (or fully shown), we have nothing to do.
-  if (showing_)
-    return;
-
-  showing_ = true;
-  value_start_ = value_current_;
-  value_end_ = 1.0;
-
-  // Make sure we actually have something to do.
-  if (slide_duration_ == 0) {
-    AnimateToState(1.0);  // Skip to the end of the animation.
-    return;
-  } else if (value_current_ == value_end_)  {
-    return;
-  }
-
-  // This will also reset the currently-occuring animation.
-  SetDuration(static_cast<int>(slide_duration_ * (1 - value_current_)));
-  Start();
-}
-
-void SlideAnimation::Hide() {
-  // If we're already hiding (or hidden), we have nothing to do.
-  if (!showing_)
-    return;
-
-  showing_ = false;
-  value_start_ = value_current_;
-  value_end_ = 0.0;
-
-  // Make sure we actually have something to do.
-  if (slide_duration_ == 0) {
-    AnimateToState(0.0);  // Skip to the end of the animation.
-    return;
-  } else if (value_current_ == value_end_) {
-    return;
-  }
-
-  // This will also reset the currently-occuring animation.
-  SetDuration(static_cast<int>(slide_duration_ * value_current_));
-  Start();
-}
-
-void SlideAnimation::AnimateToState(double state) {
-  if (state > 1.0)
-    state = 1.0;
-
-  // Make our animation ease-out.
-  switch (tween_type_) {
-    case EASE_IN:
-      state = pow(state, 2);
-      break;
-    case EASE_IN_OUT:
-      if (state < 0.5)
-        state = pow(state * 2, 2) / 2.0;
-      else
-        state = 1.0 - (pow((state - 1.0) * 2, 2) / 2.0);
-      break;
-    case FAST_IN_OUT:
-      state = (pow(state - 0.5, 3) + 0.125) / 0.25;
-      break;
-    case NONE:
-      // state remains linear.
-      break;
-    case EASE_OUT_SNAP:
-      state = 0.95 * (1.0 - pow(1.0 - state, 2));
-      break;
-    case EASE_OUT:
-    default:
-      state = 1.0 - pow(1.0 - state, 2);
-      break;
-  }
-
-  value_current_ = value_start_ + (value_end_ - value_start_) * state;
-
-  // Implement snapping.
-  if (tween_type_ == EASE_OUT_SNAP && fabs(value_current_ - value_end_) <= 0.06)
-    value_current_ = value_end_;
-
-  // Correct for any overshoot (while state may be capped at 1.0, let's not
-  // take any rounding error chances.
-  if ((value_end_ >= value_start_ && value_current_ > value_end_) ||
-      (value_end_ < value_start_ && value_current_ < value_end_)) {
-    value_current_ = value_end_;
-  }
-}
diff --git a/chrome/common/slide_animation.h b/chrome/common/slide_animation.h
deleted file mode 100644
index d998e6c..0000000
--- a/chrome/common/slide_animation.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) 2006-2008 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.
-
-#ifndef CHROME_COMMON_SLIDE_ANIMATION_H_
-#define CHROME_COMMON_SLIDE_ANIMATION_H_
-
-#include "chrome/common/animation.h"
-
-// Slide Animation
-//
-// Used for reversible animations and as a general helper class. Typical usage:
-//
-// #include "chrome/common/slide_animation.h"
-//
-// class MyClass : public AnimationDelegate {
-//  public:
-//   MyClass() {
-//     animation_.reset(new SlideAnimation(this));
-//     animation_->SetSlideDuration(500);
-//   }
-//   void OnMouseOver() {
-//     animation_->Show();
-//   }
-//   void OnMouseOut() {
-//     animation_->Hide();
-//   }
-//   void AnimationProgressed(const Animation* animation) {
-//     if (animation == animation_.get()) {
-//       Layout();
-//       SchedulePaint();
-//     } else if (animation == other_animation_.get()) {
-//       ...
-//     }
-//   }
-//   void Layout() {
-//     if (animation_->IsAnimating()) {
-//       hover_image_.SetOpacity(animation_->GetCurrentValue());
-//     }
-//   }
-//  private:
-//   scoped_ptr<SlideAnimation> animation_;
-// }
-class SlideAnimation : public Animation {
- public:
-  explicit SlideAnimation(AnimationDelegate* target);
-  virtual ~SlideAnimation();
-
-  enum TweenType {
-    NONE,          // Default linear.
-    EASE_OUT,      // Fast in, slow out.
-    EASE_IN,       // Slow in, fast out.
-    EASE_IN_OUT,   // Slow in and out, fast in the middle.
-    FAST_IN_OUT,   // Fast in and out, slow in the middle.
-    EASE_OUT_SNAP, // Fast in, slow out, snap to final value.
-  };
-
-  // Set the animation back to the 0 state.
-  virtual void Reset();
-  virtual void Reset(double value);
-
-  // Begin a showing animation or reverse a hiding animation in progress.
-  virtual void Show();
-
-  // Begin a hiding animation or reverse a showing animation in progress.
-  virtual void Hide();
-
-  // Sets the time a slide will take. Note that this isn't actually
-  // the amount of time an animation will take as the current value of
-  // the slide is considered.
-  virtual void SetSlideDuration(int duration) { slide_duration_ = duration; }
-  int GetSlideDuration() const { return slide_duration_; }
-  void SetTweenType(TweenType tween_type) { tween_type_ = tween_type; }
-
-  double GetCurrentValue() const { return value_current_; }
-  bool IsShowing() const { return showing_; }
-
- private:
-  // Overridden from Animation.
-  void AnimateToState(double state);
-
-  AnimationDelegate* target_;
-
-  TweenType tween_type_;
-
-  // Used to determine which way the animation is going.
-  bool showing_;
-
-  // Animation values. These are a layer on top of Animation::state_ to
-  // provide the reversability.
-  double value_start_;
-  double value_end_;
-  double value_current_;
-
-  // How long a hover in/out animation will last for. This defaults to
-  // kHoverFadeDurationMS, but can be overridden with SetDuration.
-  int slide_duration_;
-};
-
-#endif  // CHROME_COMMON_SLIDE_ANIMATION_H_
diff --git a/chrome/common/throb_animation.cc b/chrome/common/throb_animation.cc
deleted file mode 100644
index 402d9b5..0000000
--- a/chrome/common/throb_animation.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) 2006-2008 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/common/throb_animation.h"
-
-static const int kDefaultThrobDurationMS = 400;
-
-ThrobAnimation::ThrobAnimation(AnimationDelegate* target)
-    : SlideAnimation(target),
-      slide_duration_(GetSlideDuration()),
-      throb_duration_(kDefaultThrobDurationMS),
-      cycles_remaining_(0),
-      throbbing_(false) {
-}
-
-void ThrobAnimation::StartThrobbing(int cycles_til_stop) {
-  cycles_remaining_ = cycles_til_stop;
-  throbbing_ = true;
-  SlideAnimation::SetSlideDuration(throb_duration_);
-  if (IsAnimating())
-    return;  // We're already running, we'll cycle when current loop finishes.
-
-  if (IsShowing())
-    SlideAnimation::Hide();
-  else
-    SlideAnimation::Show();
-  cycles_remaining_ = cycles_til_stop;
-}
-
-void ThrobAnimation::Reset() {
-  ResetForSlide();
-  SlideAnimation::Reset();
-}
-
-void ThrobAnimation::Show() {
-  ResetForSlide();
-  SlideAnimation::Show();
-}
-
-void ThrobAnimation::Hide() {
-  ResetForSlide();
-  SlideAnimation::Hide();
-}
-
-void ThrobAnimation::Step() {
-  Animation::Step();
-  if (!IsAnimating() && throbbing_) {
-    // Were throbbing a finished a cycle. Start the next cycle unless we're at
-    // the end of the cycles, in which case we stop.
-    cycles_remaining_--;
-    if (IsShowing()) {
-      // We want to stop hidden, hence this doesn't check cycles_remaining_.
-      SlideAnimation::Hide();
-    } else if (cycles_remaining_ > 0) {
-      SlideAnimation::Show();
-    } else {
-      // We're done throbbing.
-      throbbing_ = false;
-    }
-  }
-}
-
-void ThrobAnimation::ResetForSlide() {
-  SlideAnimation::SetSlideDuration(slide_duration_);
-  cycles_remaining_ = 0;
-  throbbing_ = false;
-}
diff --git a/chrome/common/throb_animation.h b/chrome/common/throb_animation.h
deleted file mode 100644
index ea383e2..0000000
--- a/chrome/common/throb_animation.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) 2006-2008 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.
-
-#ifndef CHROME_COMMON_THROB_ANIMATION_H_
-#define CHROME_COMMON_THROB_ANIMATION_H_
-
-#include "chrome/common/slide_animation.h"
-
-// A subclass of SlideAnimation that can continually slide. All of the Animation
-// methods behave like that of SlideAnimation: transition to the next state.
-// The StartThrobbing method causes the ThrobAnimation to cycle between hidden
-// and shown for a set number of cycles.
-//
-// A ThrobAnimation has two durations: the duration used when behavior like
-// a SlideAnimation, and the duration used when throbbing.
-class ThrobAnimation : public SlideAnimation {
- public:
-  explicit ThrobAnimation(AnimationDelegate* target);
-  virtual ~ThrobAnimation() {}
-
-  // Starts throbbing. cycles_til_stop gives the number of cycles to do before
-  // stopping.
-  void StartThrobbing(int cycles_til_stop);
-
-  // Sets the duration of the slide animation when throbbing.
-  void SetThrobDuration(int duration) { throb_duration_ = duration; }
-
-  // Overridden to reset to the slide duration.
-  virtual void Reset();
-  virtual void Show();
-  virtual void Hide();
-
-  // Overriden to continually throb (assuming we're throbbing).
-  virtual void Step();
-
-  // Overridden to maintain the slide duration.
-  virtual void SetSlideDuration(int duration) { slide_duration_ = duration; }
-
- private:
-  // Resets state such that we behave like SlideAnimation.
-  void ResetForSlide();
-
-  // Duration of the slide animation.
-  int slide_duration_;
-
-  // Duration of the slide animation when throbbing.
-  int throb_duration_;
-
-  // If throbbing, this is the number of cycles left.
-  int cycles_remaining_;
-
-  // Are we throbbing?
-  bool throbbing_;
-
-  DISALLOW_EVIL_CONSTRUCTORS(ThrobAnimation);
-};
-
-#endif  // CHROME_COMMON_THROB_ANIMATION_H_
diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj
index ad63a8b..5eb02d9 100644
--- a/chrome/test/unit/unittests.vcproj
+++ b/chrome/test/unit/unittests.vcproj
@@ -948,10 +948,6 @@
 			Name="common"
 			>
 			<File
-				RelativePath="..\..\common\animation_unittest.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\common\bzip2_unittest.cc"
 				>
 			</File>
@@ -1096,6 +1092,14 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="app"
+			>
+			<File
+				RelativePath="..\..\..\app\animation_unittest.cc"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/views/controls/button/custom_button.cc b/chrome/views/controls/button/custom_button.cc
index 4193918..3e9d33d 100644
--- a/chrome/views/controls/button/custom_button.cc
+++ b/chrome/views/controls/button/custom_button.cc
@@ -4,17 +4,8 @@
 
 #include "chrome/views/controls/button/custom_button.h"
 
+#include "app/throb_animation.h"
 #include "base/keyboard_codes.h"
-#include "chrome/common/drag_drop_types.h"
-#include "chrome/common/gfx/chrome_canvas.h"
-#include "chrome/common/throb_animation.h"
-
-// TODO(erg): Write drag'n'drop for Linux.
-#if defined(OS_WIN)
-#include "base/base_drag_source.h"
-#include "chrome/browser/drag_utils.h"
-#include "chrome/common/os_exchange_data.h"
-#endif
 
 namespace views {
 
diff --git a/chrome/views/controls/button/custom_button.h b/chrome/views/controls/button/custom_button.h
index db0bc9e..6b486a7 100644
--- a/chrome/views/controls/button/custom_button.h
+++ b/chrome/views/controls/button/custom_button.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
 #define CHROME_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
 
-#include "chrome/common/animation.h"
+#include "app/animation.h"
 #include "chrome/views/controls/button/button.h"
 
 class ThrobAnimation;
diff --git a/chrome/views/controls/button/image_button.cc b/chrome/views/controls/button/image_button.cc
index 235cc83..8b5ec86 100644
--- a/chrome/views/controls/button/image_button.cc
+++ b/chrome/views/controls/button/image_button.cc
@@ -4,11 +4,8 @@
 
 #include "chrome/views/controls/button/image_button.h"
 
-#include "chrome/app/chrome_dll_resource.h"
+#include "app/throb_animation.h"
 #include "chrome/common/gfx/chrome_canvas.h"
-#include "chrome/common/l10n_util.h"
-#include "chrome/common/throb_animation.h"
-#include "grit/generated_resources.h"
 #include "skia/ext/image_operations.h"
 
 namespace views {
diff --git a/chrome/views/controls/button/text_button.cc b/chrome/views/controls/button/text_button.cc
index 5457281..b821db9 100644
--- a/chrome/views/controls/button/text_button.cc
+++ b/chrome/views/controls/button/text_button.cc
@@ -4,19 +4,14 @@
 
 #include "chrome/views/controls/button/text_button.h"
 
+#include "app/throb_animation.h"
 #include "app/resource_bundle.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/l10n_util.h"
-#include "chrome/common/throb_animation.h"
 #include "chrome/views/controls/button/button.h"
 #include "chrome/views/event.h"
-#include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
-#if defined(OS_WIN)
-#include "chrome/common/win_util.h"
-#endif
-
 namespace views {
 
 // Padding between the icon and text.
diff --git a/chrome/views/controls/tabbed_pane.cc b/chrome/views/controls/tabbed_pane.cc
index 6fac67c..64d267b1 100644
--- a/chrome/views/controls/tabbed_pane.cc
+++ b/chrome/views/controls/tabbed_pane.cc
@@ -13,7 +13,6 @@
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/l10n_util_win.h"
-#include "chrome/common/throb_animation.h"
 #include "chrome/views/background.h"
 #include "chrome/views/fill_layout.h"
 #include "chrome/views/widget/root_view.h"