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

ui/ui.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'shell_dialogs.gypi',
@@ skipping 13 matching lines @@
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libpng/libpng.gyp:libpng',
         '../third_party/zlib/zlib.gyp:zlib',
         '../url/url.gyp:url_lib',
         'base/strings/ui_strings.gyp:ui_strings',
         '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.
       'export_dependent_settings': [
         '../net/net.gyp:net',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
       ],
       'sources' : [
         'android/ui_jni_registrar.cc',
@@ skipping 11 matching lines @@
         'base/accelerators/platform_accelerator_cocoa.mm',
         'base/accelerators/platform_accelerator_gtk.cc',
         'base/accelerators/platform_accelerator_gtk.h',
         'base/accelerators/accelerator_manager.cc',
         'base/accelerators/accelerator_manager.h',
         'base/accessibility/accessibility_types.h',
         'base/accessibility/accessible_text_utils.cc',
         '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',
         'base/clipboard/clipboard.h',
         'base/clipboard/clipboard_android.cc',
         'base/clipboard/clipboard_android_initialization.h',
         'base/clipboard/clipboard_aura.cc',
         'base/clipboard/clipboard_aurax11.cc',
         'base/clipboard/clipboard_constants.cc',
         'base/clipboard/clipboard_gtk.cc',
@@ skipping 296 matching lines @@
         'base/x/work_area_watcher_x.h',
         'base/x/x11_atom_cache.cc',
         'base/x/x11_atom_cache.h',
         'base/x/x11_util.cc',
         'base/x/x11_util.h',
         'base/x/x11_util_internal.h',
         'gfx/android/device_display_info.cc',
         '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',
         'gfx/box_f.h',
         'gfx/break_list.h',
         'gfx/canvas.cc',
         'gfx/canvas.h',
         'gfx/canvas_android.cc',
         'gfx/canvas_paint_gtk.cc',
         'gfx/canvas_paint_gtk.h',
@@ skipping 212 matching lines @@
           'dependencies': [
             '<(libjpeg_gyp_path):libjpeg',
           ],
         }, {  # OS=="ios"
           # iOS only uses a subset of UI.
           'sources/': [
             ['exclude', '\\.(cc|mm)$'],
             ['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/'],
             ['include', '^base/ui_base_'],
           ],
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework',
             ],
           },
@@ skipping 241 matching lines @@
             'base/events/event_handler.h',
             'base/events/event_target.cc',
             'base/events/event_target.h',
             'base/x/events_x.cc',
           ],
         }],
         ['OS=="android"', {
           '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',
             'base/events/event_utils.cc',
             'base/keycodes/keyboard_code_conversion.cc',
             'base/l10n/l10n_font_util.cc',
             'base/models/button_menu_item_model.cc',
             'base/models/dialog_model.cc',
             'base/theme_provider.cc',
             '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',
           ],
           'dependencies': [
             'ui_jni_headers',
           ],
           'include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)/ui',
           ],
@@ skipping 158 matching lines @@
               'xcode_settings': {
                 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
               },
             }],
           ],
         },
       ],
     }],
   ],
 }