views: Move the remaining files to ui/views/controls/.

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 34 matching lines @@
       ],
       'sources': [
         # All .cc, .h under views, except unittests
         'accessible_pane_view.cc',
         'accessible_pane_view.h',
         'background.cc',
         'background.h',
         'border.cc',
         'border.h',
         'context_menu_controller.h',
-        'controls/focusable_border.cc',
-        'controls/focusable_border.h',
-        'controls/image_view.cc',
-        'controls/image_view.h',
-        'controls/message_box_view.cc',
-        'controls/message_box_view.h',
-        'controls/native_control.cc',
-        'controls/native_control.h',
-        'controls/native_control_gtk.cc',
-        'controls/native_control_gtk.h',
-        'controls/native_control_win.cc',
-        'controls/native_control_win.h',
-        'controls/progress_bar.h',
-        'controls/progress_bar.cc',
-        'controls/resize_area.cc',
-        'controls/resize_area.h',
-        'controls/resize_area_delegate.h',
-        'controls/scroll_view.cc',
-        'controls/scroll_view.h',
-        'controls/separator.cc',
-        'controls/separator.h',
-        'controls/single_split_view.cc',
-        'controls/single_split_view.h',
-        'controls/single_split_view_listener.h',
-        'controls/throbber.cc',
-        'controls/throbber.h',
         #'debug_utils.cc',
         #'debug_utils.h',
         'drag_controller.h',
         'drag_utils.cc',
         'drag_utils.h',
         'drag_utils_aura.cc',
         'drag_utils_gtk.cc',
         'drag_utils_win.cc',
         'metrics.cc',
         'metrics.h',
@@ skipping 52 matching lines @@
         '../ui/views/controls/combobox/combobox.cc',
         '../ui/views/controls/combobox/combobox.h',
         '../ui/views/controls/combobox/combobox_listener.h',
         '../ui/views/controls/combobox/native_combobox_gtk.cc',
         '../ui/views/controls/combobox/native_combobox_gtk.h',
         '../ui/views/controls/combobox/native_combobox_views.cc',
         '../ui/views/controls/combobox/native_combobox_views.h',
         '../ui/views/controls/combobox/native_combobox_win.cc',
         '../ui/views/controls/combobox/native_combobox_win.h',
         '../ui/views/controls/combobox/native_combobox_wrapper.h',
+        '../ui/views/controls/focusable_border.cc',
+        '../ui/views/controls/focusable_border.h',
+        '../ui/views/controls/image_view.cc',
+        '../ui/views/controls/image_view.h',
         '../ui/views/controls/label.cc',
         '../ui/views/controls/label.h',
         '../ui/views/controls/link.cc',
         '../ui/views/controls/link.h',
         '../ui/views/controls/link_listener.h',
         '../ui/views/controls/menu/menu.cc',
         '../ui/views/controls/menu/menu.h',
         '../ui/views/controls/menu/menu_2.cc',
         '../ui/views/controls/menu/menu_2.h',
         '../ui/views/controls/menu/menu_config.cc',
@@ skipping 39 matching lines @@
         '../ui/views/controls/menu/native_menu_views.h',
         '../ui/views/controls/menu/native_menu_win.cc',
         '../ui/views/controls/menu/native_menu_win.h',
         '../ui/views/controls/menu/nested_dispatcher_gtk.cc',
         '../ui/views/controls/menu/nested_dispatcher_gtk.h',
         '../ui/views/controls/menu/menu_image_util.cc',
         '../ui/views/controls/menu/menu_image_util.h',
         '../ui/views/controls/menu/submenu_view.cc',
         '../ui/views/controls/menu/submenu_view.h',
         '../ui/views/controls/menu/view_menu_delegate.h',
+        '../ui/views/controls/message_box_view.cc',
+        '../ui/views/controls/message_box_view.h',
+        '../ui/views/controls/native_control.cc',
+        '../ui/views/controls/native_control.h',
+        '../ui/views/controls/native_control_gtk.cc',
+        '../ui/views/controls/native_control_gtk.h',
+        '../ui/views/controls/native_control_win.cc',
+        '../ui/views/controls/native_control_win.h',
         '../ui/views/controls/native/native_view_host.cc',
         '../ui/views/controls/native/native_view_host.h',
         '../ui/views/controls/native/native_view_host_aura.cc',
         '../ui/views/controls/native/native_view_host_aura.h',
         '../ui/views/controls/native/native_view_host_gtk.cc',
         '../ui/views/controls/native/native_view_host_gtk.h',
         '../ui/views/controls/native/native_view_host_win.cc',
         '../ui/views/controls/native/native_view_host_win.h',
+        '../ui/views/controls/progress_bar.cc',
+        '../ui/views/controls/progress_bar.h',
+        '../ui/views/controls/resize_area.cc',
+        '../ui/views/controls/resize_area.h',
+        '../ui/views/controls/resize_area_delegate.h',
+        '../ui/views/controls/scroll_view.cc',
+        '../ui/views/controls/scroll_view.h',
         '../ui/views/controls/scrollbar/base_scroll_bar.cc',
         '../ui/views/controls/scrollbar/base_scroll_bar.h',
         '../ui/views/controls/scrollbar/base_scroll_bar_button.cc',
         '../ui/views/controls/scrollbar/base_scroll_bar_button.h',
         '../ui/views/controls/scrollbar/base_scroll_bar_thumb.cc',
         '../ui/views/controls/scrollbar/base_scroll_bar_thumb.h',
         '../ui/views/controls/scrollbar/bitmap_scroll_bar.cc',
         '../ui/views/controls/scrollbar/bitmap_scroll_bar.h',
         '../ui/views/controls/scrollbar/native_scroll_bar_gtk.cc',
         '../ui/views/controls/scrollbar/native_scroll_bar_gtk.h',
         '../ui/views/controls/scrollbar/native_scroll_bar_views.cc',
         '../ui/views/controls/scrollbar/native_scroll_bar_views.h',
         '../ui/views/controls/scrollbar/native_scroll_bar_win.cc',
         '../ui/views/controls/scrollbar/native_scroll_bar_win.h',
         '../ui/views/controls/scrollbar/native_scroll_bar_wrapper.h',
         '../ui/views/controls/scrollbar/native_scroll_bar.cc',
         '../ui/views/controls/scrollbar/native_scroll_bar.h',
         '../ui/views/controls/scrollbar/scroll_bar.cc',
         '../ui/views/controls/scrollbar/scroll_bar.h',
+        '../ui/views/controls/separator.cc',
+        '../ui/views/controls/separator.h',
+        '../ui/views/controls/single_split_view.cc',
+        '../ui/views/controls/single_split_view.h',
+        '../ui/views/controls/single_split_view_listener.h',
         '../ui/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc',
         '../ui/views/controls/tabbed_pane/native_tabbed_pane_gtk.h',
         '../ui/views/controls/tabbed_pane/native_tabbed_pane_win.cc',
         '../ui/views/controls/tabbed_pane/native_tabbed_pane_win.h',
         '../ui/views/controls/tabbed_pane/native_tabbed_pane_wrapper.h',
         '../ui/views/controls/tabbed_pane/tabbed_pane.cc',
         '../ui/views/controls/tabbed_pane/tabbed_pane.h',
         '../ui/views/controls/tabbed_pane/tabbed_pane_listener.h',
         '../ui/views/controls/table/native_table_wrapper.h',
         '../ui/views/controls/table/native_table_gtk.cc',
@@ skipping 16 matching lines @@
         '../ui/views/controls/textfield/native_textfield_views.cc',
         '../ui/views/controls/textfield/native_textfield_views.h',
         '../ui/views/controls/textfield/native_textfield_win.cc',
         '../ui/views/controls/textfield/native_textfield_win.h',
         '../ui/views/controls/textfield/native_textfield_wrapper.h',
         '../ui/views/controls/textfield/textfield.cc',
         '../ui/views/controls/textfield/textfield.h',
         '../ui/views/controls/textfield/textfield_controller.h',
         '../ui/views/controls/textfield/textfield_views_model.cc',
         '../ui/views/controls/textfield/textfield_views_model.h',
+        '../ui/views/controls/throbber.cc',
+        '../ui/views/controls/throbber.h',
         '../ui/views/controls/tree/tree_view.cc',
         '../ui/views/controls/tree/tree_view.h',
         '../ui/views/events/event.cc',
         '../ui/views/events/event.h',
         '../ui/views/events/event_aura.cc',
         '../ui/views/events/event_gtk.cc',
         '../ui/views/events/event_win.cc',
         '../ui/views/events/event_x.cc',
         '../ui/views/focus/accelerator_handler.h',
         '../ui/views/focus/accelerator_handler_aura.cc',
@@ skipping 101 matching lines @@
         '../third_party/wtl/include',
       ],
       'conditions': [
         ['use_aura==1', {
           'sources/': [
             ['exclude', '_(gtk|x)\\.cc$'],
             ['exclude', '/(gtk|x)_[^/]*\\.cc$'],
             ['exclude', '../ui/views/controls/menu/menu_2.*'],
           ],
           'sources!': [
-            'controls/native_control.cc',
-            'controls/native_control.h',
             'drag_utils_win.cc',
             '../ui/views/controls/menu/menu_config_linux.cc',
             '../ui/views/controls/menu/menu_item_view_linux.cc',
             '../ui/views/controls/menu/menu_separator_linux.cc',
+            '../ui/views/controls/native_control.cc',
+            '../ui/views/controls/native_control.h',
             '../ui/views/controls/scrollbar/bitmap_scroll_bar.cc',
             '../ui/views/controls/scrollbar/bitmap_scroll_bar.h',
             '../ui/views/controls/tabbed_pane/tabbed_pane.cc',
             '../ui/views/controls/tabbed_pane/tabbed_pane.h',
             '../ui/views/controls/table/group_table_view.cc',
             '../ui/views/controls/table/group_table_view.h',
             '../ui/views/controls/table/native_table_wrapper.h',
             '../ui/views/controls/table/table_view.cc',
             '../ui/views/controls/table/table_view.h',
             '../ui/views/controls/table/table_view2.cc',
             '../ui/views/controls/table/table_view2.h',
             '../ui/views/controls/table/table_view_observer.h',
             '../ui/views/controls/tree/tree_view.cc',
             '../ui/views/controls/tree/tree_view.h',
             '../ui/views/widget/aero_tooltip_manager.cc',
             '../ui/views/widget/aero_tooltip_manager.h',
             '../ui/views/widget/child_window_message_processor.cc',
             '../ui/views/widget/child_window_message_processor.h',
           ],
         },
         ],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:x11',
             '../build/linux/system.gyp:xext',
           ],
           'sources!': [
-            'controls/native_control.cc',
             '../ui/views/accessibility/native_view_accessibility_win.cc',
+            '../ui/views/controls/native_control.cc',
             '../ui/views/controls/scrollbar/bitmap_scroll_bar.cc',
             '../ui/views/controls/table/group_table_view.cc',
             '../ui/views/controls/table/table_view.cc',
             '../ui/views/controls/tree/tree_view.cc',
             '../ui/views/events/event_win.cc',
             '../ui/views/widget/aero_tooltip_manager.cc',
             '../ui/views/widget/child_window_message_processor.cc',
             '../ui/views/widget/child_window_message_processor.h',
             '../ui/views/widget/native_widget_win.cc',
           ],
@@ skipping 63 matching lines @@
       'include_dirs': [
         '..',
       ],
       'sources': [
         '../ui/views/animation/bounds_animator_unittest.cc',
         '../ui/views/bubble/bubble_delegate_unittest.cc',
         '../ui/views/bubble/bubble_frame_view_unittest.cc',
         '../ui/views/controls/combobox/native_combobox_views_unittest.cc',
         '../ui/views/controls/label_unittest.cc',
         '../ui/views/controls/menu/menu_model_adapter_unittest.cc',
+        '../ui/views/controls/progress_bar_unittest.cc',
         '../ui/views/controls/scrollbar/scrollbar_unittest.cc',
+        '../ui/views/controls/single_split_view_unittest.cc',
         '../ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc',
         '../ui/views/controls/table/table_view_unittest.cc',
         '../ui/views/controls/textfield/native_textfield_views_unittest.cc',
         '../ui/views/controls/textfield/textfield_views_model_unittest.cc',
         '../ui/views/events/event_unittest.cc',
         '../ui/views/focus/accelerator_handler_gtk_unittest.cc',
         '../ui/views/focus/focus_manager_test.h',
         '../ui/views/focus/focus_manager_test.cc',
         '../ui/views/focus/focus_manager_unittest.cc',
         '../ui/views/focus/focus_manager_unittest_win.cc',
         '../ui/views/focus/focus_traversal_unittest.cc',
         '../ui/views/layout/box_layout_unittest.cc',
         '../ui/views/layout/grid_layout_unittest.cc',
         '../ui/views/test/test_views_delegate.cc',
         '../ui/views/test/test_views_delegate.h',
         '../ui/views/test/views_test_base.cc',
         '../ui/views/test/views_test_base.h',
         '../ui/views/widget/native_widget_test_utils.h',
         '../ui/views/widget/native_widget_test_utils_aura.cc',
         '../ui/views/widget/native_widget_test_utils_gtk.cc',
         '../ui/views/widget/native_widget_test_utils_win.cc',
         '../ui/views/widget/native_widget_unittest.cc',
         '../ui/views/widget/native_widget_win_unittest.cc',
         '../ui/views/widget/widget_unittest.cc',
         'accessible_pane_view_unittest.cc',
-        'controls/progress_bar_unittest.cc',
-        'controls/single_split_view_unittest.cc',
         'run_all_unittests.cc',
         'view_unittest.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': [
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
@@ skipping 137 matching lines @@
           },
           'sources': [
             '../ui/views/examples/table_example.cc',
             '../ui/views/examples/table_example.h',
           ],
         }],
       ],
     },
   ],
 }