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

ui/ui.gyp

Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 5de12dc1d50038d754563ceb28aab688f2d79c7d..8d1aac6c35a61b355d015f618efe14e413477a00 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -31,6 +31,8 @@
         'ui_resources',
       ],
       'defines': [
+        # TODO(sky): remove once gfx dependencies are corrected.
+        'GFX_IMPLEMENTATION',
         'UI_IMPLEMENTATION',
       ],
       # Export these dependencies since text_elider.h includes ICU headers.
@@ -62,23 +64,6 @@
         'base/accessibility/accessible_text_utils.h',
         'base/accessibility/accessible_view_state.cc',
         'base/accessibility/accessible_view_state.h',
-        'base/animation/animation.cc',
-        'base/animation/animation.h',
-        'base/animation/animation_container.cc',
-        'base/animation/animation_container.h',
-        'base/animation/animation_container_element.h',
-        'base/animation/animation_container_observer.h',
-        'base/animation/animation_delegate.h',
-        'base/animation/linear_animation.cc',
-        'base/animation/linear_animation.h',
-        'base/animation/multi_animation.cc',
-        'base/animation/multi_animation.h',
-        'base/animation/slide_animation.cc',
-        'base/animation/slide_animation.h',
-        'base/animation/throb_animation.cc',
-        'base/animation/throb_animation.h',
-        'base/animation/tween.cc',
-        'base/animation/tween.h',
         'base/base_window.cc',
         'base/base_window.h',
         'base/clipboard/clipboard.cc',
@@ -395,6 +380,23 @@
         'gfx/android/device_display_info.h',
         'gfx/android/java_bitmap.cc',
         'gfx/android/java_bitmap.h',
+        'gfx/animation/animation.cc',
+        'gfx/animation/animation.h',
+        'gfx/animation/animation_container.cc',
+        'gfx/animation/animation_container.h',
+        'gfx/animation/animation_container_element.h',
+        'gfx/animation/animation_container_observer.h',
+        'gfx/animation/animation_delegate.h',
+        'gfx/animation/linear_animation.cc',
+        'gfx/animation/linear_animation.h',
+        'gfx/animation/multi_animation.cc',
+        'gfx/animation/multi_animation.h',
+        'gfx/animation/slide_animation.cc',
+        'gfx/animation/slide_animation.h',
+        'gfx/animation/throb_animation.cc',
+        'gfx/animation/throb_animation.h',
+        'gfx/animation/tween.cc',
+        'gfx/animation/tween.h',
         'gfx/blit.cc',
         'gfx/blit.h',
         'gfx/box_f.cc',
@@ -627,9 +629,9 @@
             ['include', '_ios\\.(cc|mm)$'],
             ['include', '(^|/)ios/'],
             ['include', '^gfx/'],
+            ['include', '^gfx/animation/'],
             ['exclude', '^gfx/codec/jpeg_codec\\.cc$'],
             ['include', '^gfx/range/'],
-            ['include', '^base/animation/'],
             ['include', '^base/l10n/'],
             ['include', '^base/layout'],
             ['include', '^base/resource/'],
@@ -891,7 +893,6 @@
           'sources!': [
             'base/accessibility/accessible_text_utils.cc',
             'base/accessibility/accessible_view_state.cc',
-            'base/animation/throb_animation.cc',
             'base/default_theme_provider.cc',
             'base/dragdrop/drag_utils.cc',
             'base/dragdrop/drag_utils.h',
@@ -904,6 +905,7 @@
             'base/touch/touch_device.cc',
             'base/touch/touch_editing_controller.cc',
             'base/ui_base_types.cc',
+            'gfx/animation/throb_animation.cc',
             'gfx/display_observer.cc',
             'gfx/path.cc',
             'gfx/selection_model.cc',