views: Move more two directories into ui/views/.

views/views.gyp

 # Copyright (c) 2011 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,
   },
 
   'target_defaults': {
     'conditions': [
@@ skipping 39 matching lines @@
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_resources_standard',
       ],
       'defines': [
         'VIEWS_IMPLEMENTATION',
       ],
       'sources': [
         # All .cc, .h under views, except unittests
         'accessible_pane_view.cc',
         'accessible_pane_view.h',
-        'animation/bounds_animator.cc',
-        'animation/bounds_animator.h',
         'background.cc',
         'background.h',
         'border.cc',
         'border.h',
         'bubble/bubble_border.cc',
         'bubble/bubble_border.h',
         'bubble/border_contents_view.cc',
         'bubble/border_contents_view.h',
         'bubble/bubble_delegate.cc',
         'bubble/bubble_delegate.h',
@@ skipping 315 matching lines @@
         'widget/native_widget_views.cc',
         'widget/native_widget_views.h',
         'widget/native_widget_win.cc',
         'widget/native_widget_win.h',
         'widget/widget.cc',
         'widget/widget.h',
         'widget/widget_delegate.cc',
         'widget/widget_delegate.h',
         'widget/window_manager.cc',
         'widget/window_manager.h',
+        '../ui/views/animation/bounds_animator.cc',
+        '../ui/views/animation/bounds_animator.h',
         '../ui/views/accessibility/native_view_accessibility_win.cc',
         '../ui/views/accessibility/native_view_accessibility_win.h',
         '../ui/views/window/client_view.cc',
         '../ui/views/window/client_view.h',
         '../ui/views/window/custom_frame_view.cc',
         '../ui/views/window/window/custom_frame_view.h',
         '../ui/views/window/dialog_client_view.cc',
         '../ui/views/window/window/dialog_client_view.h',
         '../ui/views/window/dialog_delegate.cc',
         '../ui/views/window/dialog_delegate.h',
@@ skipping 160 matching lines @@
         '../ui/ui.gyp:gfx_resources',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_resources_standard',
         'views',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
+        '../ui/views/animation/bounds_animator_unittest.cc',
         'accessible_pane_view_unittest.cc',
-        'animation/bounds_animator_unittest.cc',
         'bubble/bubble_delegate_unittest.cc',
         'bubble/bubble_frame_view_unittest.cc',
         'controls/label_unittest.cc',
         'controls/progress_bar_unittest.cc',
         'controls/single_split_view_unittest.cc',
         'controls/tabbed_pane/tabbed_pane_unittest.cc',
         'controls/table/table_view_unittest.cc',
         'controls/combobox/native_combobox_views_unittest.cc',
         'controls/menu/menu_model_adapter_unittest.cc',
         'controls/textfield/native_textfield_views_unittest.cc',
@@ skipping 318 matching lines @@
             '../ui/ui.gyp:gfx_resources',
             '../ui/ui.gyp:ui',
             '../ui/ui.gyp:ui_resources',
             '../ui/ui.gyp:ui_resources_standard',
             'views',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
-            'aura_desktop/aura_desktop_main.cc',
+            '../ui/aura_desktop/aura_desktop_main.cc',
             '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
           ],
           'conditions': [
             ['OS=="win"', {
               'link_settings': {
                 'libraries': [
                   '-limm32.lib',
                   '-loleacc.lib',
                 ]
               },
               'include_dirs': [
                 '../third_party/wtl/include',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }