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

36 files changed, 86 insertions, 97 deletions

diff --git a/chrome/common/animation.cc b/app/animation.cc
index 0898935..6a4e7b7 100644
--- a/chrome/common/animation.cc
+++ b/app/animation.cc
@@ -2,8 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "app/animation.h"
+
 #include "base/message_loop.h"
-#include "chrome/common/animation.h"
 
 using base::TimeDelta;
 
diff --git a/chrome/common/animation.h b/app/animation.h
index 1771b16..58a2c67 100644
--- a/chrome/common/animation.h
+++ b/app/animation.h
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 // Inspired by NSAnimation
 
-#ifndef CHROME_COMMON_ANIMATION_H__
-#define CHROME_COMMON_ANIMATION_H__
+#ifndef APP_ANIMATION_H_
+#define APP_ANIMATION_H_
 
 #include "base/timer.h"
 
@@ -116,7 +116,7 @@ class Animation {
   // Called when the animation's timer expires, calls Step.
   void Run();
 
-  DISALLOW_EVIL_CONSTRUCTORS(Animation);
+  DISALLOW_COPY_AND_ASSIGN(Animation);
 };
 
-#endif  // CHROME_COMMON_ANIMATION_H__
+#endif  // APP_ANIMATION_H_
diff --git a/chrome/common/animation_unittest.cc b/app/animation_unittest.cc
index 6ca19e4..a7450e3 100644
--- a/chrome/common/animation_unittest.cc
+++ b/app/animation_unittest.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "app/animation.h"
 #include "base/message_loop.h"
-#include "chrome/common/animation.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using namespace std;
diff --git a/app/app.vcproj b/app/app.vcproj
index 22c1e1f..02d76cd 100644
--- a/app/app.vcproj
+++ b/app/app.vcproj
@@ -122,6 +122,14 @@
 	</References>

 	<Files>

 		<File

+			RelativePath=".\animation.cc"

+			>

+		</File>

+		<File

+			RelativePath=".\animation.h"

+			>

+		</File>

+		<File

 			RelativePath=".\resource_bundle.cc"

 			>

 		</File>

@@ -133,6 +141,22 @@
 			RelativePath=".\resource_bundle_win.cc"

 			>

 		</File>

+		<File

+			RelativePath=".\slide_animation.cc"

+			>

+		</File>

+		<File

+			RelativePath=".\slide_animation.h"

+			>

+		</File>

+		<File

+			RelativePath=".\throb_animation.cc"

+			>

+		</File>

+		<File

+			RelativePath=".\throb_animation.h"

+			>

+		</File>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/chrome/common/slide_animation.cc b/app/slide_animation.cc
index ffcb656..ca468d2 100644
--- a/chrome/common/slide_animation.cc
+++ b/app/slide_animation.cc
@@ -2,7 +2,7 @@
 // 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 "app/slide_animation.h"
 
 #include <math.h>
 
diff --git a/chrome/common/slide_animation.h b/app/slide_animation.h
index d998e6c..4bbcd2e 100644
--- a/chrome/common/slide_animation.h
+++ b/app/slide_animation.h
@@ -2,16 +2,16 @@
 // 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_
+#ifndef APP_SLIDE_ANIMATION_H_
+#define APP_SLIDE_ANIMATION_H_
 
-#include "chrome/common/animation.h"
+#include "app/animation.h"
 
 // Slide Animation
 //
 // Used for reversible animations and as a general helper class. Typical usage:
 //
-// #include "chrome/common/slide_animation.h"
+// #include "app/slide_animation.h"
 //
 // class MyClass : public AnimationDelegate {
 //  public:
@@ -95,6 +95,8 @@ class SlideAnimation : public Animation {
   // How long a hover in/out animation will last for. This defaults to
   // kHoverFadeDurationMS, but can be overridden with SetDuration.
   int slide_duration_;
+
+  DISALLOW_COPY_AND_ASSIGN(SlideAnimation);
 };
 
-#endif  // CHROME_COMMON_SLIDE_ANIMATION_H_
+#endif  // APP_SLIDE_ANIMATION_H_
diff --git a/chrome/common/throb_animation.cc b/app/throb_animation.cc
index 402d9b5..28b5763 100644
--- a/chrome/common/throb_animation.cc
+++ b/app/throb_animation.cc
@@ -2,7 +2,7 @@
 // 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"
+#include "app/throb_animation.h"
 
 static const int kDefaultThrobDurationMS = 400;
 
diff --git a/chrome/common/throb_animation.h b/app/throb_animation.h
index ea383e2..637e8e0 100644
--- a/chrome/common/throb_animation.h
+++ b/app/throb_animation.h
@@ -2,10 +2,10 @@
 // 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_
+#ifndef APP_THROB_ANIMATION_H_
+#define APP_THROB_ANIMATION_H_
 
-#include "chrome/common/slide_animation.h"
+#include "app/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.
@@ -53,7 +53,7 @@ class ThrobAnimation : public SlideAnimation {
   // Are we throbbing?
   bool throbbing_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(ThrobAnimation);
+  DISALLOW_COPY_AND_ASSIGN(ThrobAnimation);
 };
 
-#endif  // CHROME_COMMON_THROB_ANIMATION_H_
+#endif  // APP_THROB_ANIMATION_H_
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/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/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"