views: Move table and tree directories 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 178 matching lines @@
         'controls/single_split_view.h',
         'controls/single_split_view_listener.h',
         'controls/tabbed_pane/native_tabbed_pane_gtk.cc',
         'controls/tabbed_pane/native_tabbed_pane_gtk.h',
         'controls/tabbed_pane/native_tabbed_pane_win.cc',
         'controls/tabbed_pane/native_tabbed_pane_win.h',
         'controls/tabbed_pane/native_tabbed_pane_wrapper.h',
         'controls/tabbed_pane/tabbed_pane.cc',
         'controls/tabbed_pane/tabbed_pane.h',
         'controls/tabbed_pane/tabbed_pane_listener.h',
-        'controls/table/native_table_wrapper.h',
-        'controls/table/native_table_gtk.cc',
-        'controls/table/native_table_gtk.h',
-        'controls/table/native_table_win.cc',
-        'controls/table/native_table_win.h',
-        'controls/table/group_table_view.cc',
-        'controls/table/group_table_view.h',
-        'controls/table/table_view.cc',
-        'controls/table/table_view.h',
-        'controls/table/table_view2.cc',
-        'controls/table/table_view2.h',
-        'controls/table/table_view_observer.h',
         'controls/textfield/gtk_views_entry.cc',
         'controls/textfield/gtk_views_entry.h',
         'controls/textfield/gtk_views_textview.cc',
         'controls/textfield/gtk_views_textview.h',
         'controls/textfield/textfield.cc',
         'controls/textfield/textfield.h',
         'controls/textfield/textfield_controller.h',
         'controls/textfield/textfield_views_model.cc',
         'controls/textfield/textfield_views_model.h',
         'controls/textfield/native_textfield_gtk.cc',
         'controls/textfield/native_textfield_gtk.h',
         'controls/textfield/native_textfield_win.cc',
         'controls/textfield/native_textfield_win.h',
         'controls/textfield/native_textfield_wrapper.h',
         'controls/textfield/native_textfield_views.cc',
         'controls/textfield/native_textfield_views.h',
         'controls/throbber.cc',
         'controls/throbber.h',
-        'controls/tree/tree_view.cc',
-        'controls/tree/tree_view.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 14 matching lines @@
         'view.cc',
         'view.h',
         'view_aura.cc',
         'view_constants.cc',
         'view_constants.h',
         'view_gtk.cc',
         'view_text_utils.cc',
         'view_text_utils.h',
         'view_win.cc',
         'views_delegate.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',
-        '../ui/views/widget/default_theme_provider.cc',
-        '../ui/views/widget/default_theme_provider.h',
-        '../ui/views/widget/drop_helper.cc',
-        '../ui/views/widget/drop_helper.h',
-        '../ui/views/widget/drop_target_gtk.cc',
-        '../ui/views/widget/drop_target_gtk.h',
-        '../ui/views/widget/drop_target_win.cc',
-        '../ui/views/widget/drop_target_win.h',
-        '../ui/views/widget/gtk_views_fixed.cc',
-        '../ui/views/widget/gtk_views_fixed.h',
-        '../ui/views/widget/gtk_views_window.cc',
-        '../ui/views/widget/gtk_views_window.h',
-        '../ui/views/widget/root_view.cc',
-        '../ui/views/widget/root_view.h',
-        '../ui/views/widget/tooltip_manager_gtk.cc',
-        '../ui/views/widget/tooltip_manager_gtk.h',
-        '../ui/views/widget/tooltip_manager_views.cc',
-        '../ui/views/widget/tooltip_manager_views.h',
-        '../ui/views/widget/tooltip_manager_win.cc',
-        '../ui/views/widget/tooltip_manager_win.h',
-        '../ui/views/widget/tooltip_manager.cc',
-        '../ui/views/widget/tooltip_manager.h',
-        '../ui/views/widget/monitor_win.cc',
-        '../ui/views/widget/monitor_win.h',
-        '../ui/views/widget/native_widget.h',
-        '../ui/views/widget/native_widget_aura.cc',
-        '../ui/views/widget/native_widget_aura.h',
-        '../ui/views/widget/native_widget_delegate.h',
-        '../ui/views/widget/native_widget_private.h',
-        '../ui/views/widget/native_widget_gtk.cc',
-        '../ui/views/widget/native_widget_gtk.h',
-        '../ui/views/widget/native_widget_win.cc',
-        '../ui/views/widget/native_widget_win.h',
-        '../ui/views/widget/widget.cc',
-        '../ui/views/widget/widget.h',
-        '../ui/views/widget/widget_delegate.cc',
-        '../ui/views/widget/widget_delegate.h',
-        '../ui/views/widget/window_manager.cc',
-        '../ui/views/widget/window_manager.h',
         '../ui/views/accessibility/native_view_accessibility_win.cc',
         '../ui/views/accessibility/native_view_accessibility_win.h',
         '../ui/views/animation/bounds_animator.cc',
         '../ui/views/animation/bounds_animator.h',
         '../ui/views/bubble/border_contents_view.cc',
         '../ui/views/bubble/border_contents_view.h',
         '../ui/views/bubble/bubble_border.cc',
         '../ui/views/bubble/bubble_border.h',
         '../ui/views/bubble/bubble_delegate.cc',
         '../ui/views/bubble/bubble_delegate.h',
         '../ui/views/bubble/bubble_frame_view.cc',
         '../ui/views/bubble/bubble_frame_view.h',
+        '../ui/views/controls/table/native_table_wrapper.h',
+        '../ui/views/controls/table/native_table_gtk.cc',
+        '../ui/views/controls/table/native_table_gtk.h',
+        '../ui/views/controls/table/native_table_win.cc',
+        '../ui/views/controls/table/native_table_win.h',
+        '../ui/views/controls/table/group_table_view.cc',
+        '../ui/views/controls/table/group_table_view.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/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',
         '../ui/views/focus/accelerator_handler_gtk.cc',
         '../ui/views/focus/accelerator_handler_win.cc',
@@ skipping 29 matching lines @@
         '../ui/views/layout/fill_layout.h',
         '../ui/views/layout/grid_layout.cc',
         '../ui/views/layout/grid_layout.h',
         '../ui/views/layout/layout_constants.h',
         '../ui/views/layout/layout_manager.cc',
         '../ui/views/layout/layout_manager.h',
         '../ui/views/touchui/gesture_manager.cc',
         '../ui/views/touchui/gesture_manager.h',
         '../ui/views/touchui/touch_selection_controller.cc',
         '../ui/views/touchui/touch_selection_controller.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',
+        '../ui/views/widget/default_theme_provider.cc',
+        '../ui/views/widget/default_theme_provider.h',
+        '../ui/views/widget/drop_helper.cc',
+        '../ui/views/widget/drop_helper.h',
+        '../ui/views/widget/drop_target_gtk.cc',
+        '../ui/views/widget/drop_target_gtk.h',
+        '../ui/views/widget/drop_target_win.cc',
+        '../ui/views/widget/drop_target_win.h',
+        '../ui/views/widget/gtk_views_fixed.cc',
+        '../ui/views/widget/gtk_views_fixed.h',
+        '../ui/views/widget/gtk_views_window.cc',
+        '../ui/views/widget/gtk_views_window.h',
+        '../ui/views/widget/root_view.cc',
+        '../ui/views/widget/root_view.h',
+        '../ui/views/widget/tooltip_manager_gtk.cc',
+        '../ui/views/widget/tooltip_manager_gtk.h',
+        '../ui/views/widget/tooltip_manager_views.cc',
+        '../ui/views/widget/tooltip_manager_views.h',
+        '../ui/views/widget/tooltip_manager_win.cc',
+        '../ui/views/widget/tooltip_manager_win.h',
+        '../ui/views/widget/tooltip_manager.cc',
+        '../ui/views/widget/tooltip_manager.h',
+        '../ui/views/widget/monitor_win.cc',
+        '../ui/views/widget/monitor_win.h',
+        '../ui/views/widget/native_widget.h',
+        '../ui/views/widget/native_widget_aura.cc',
+        '../ui/views/widget/native_widget_aura.h',
+        '../ui/views/widget/native_widget_delegate.h',
+        '../ui/views/widget/native_widget_private.h',
+        '../ui/views/widget/native_widget_gtk.cc',
+        '../ui/views/widget/native_widget_gtk.h',
+        '../ui/views/widget/native_widget_win.cc',
+        '../ui/views/widget/native_widget_win.h',
+        '../ui/views/widget/widget.cc',
+        '../ui/views/widget/widget.h',
+        '../ui/views/widget/widget_delegate.cc',
+        '../ui/views/widget/widget_delegate.h',
+        '../ui/views/widget/window_manager.cc',
+        '../ui/views/widget/window_manager.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',
         '../ui/views/window/native_frame_view.cc',
         '../ui/views/window/native_frame_view.h',
@@ skipping 16 matching lines @@
           'sources!': [
             'controls/menu/menu_config_linux.cc',
             'controls/menu/menu_item_view_linux.cc',
             'controls/menu/menu_separator_linux.cc',
             'controls/native_control.cc',
             'controls/native_control.h',
             'controls/scrollbar/bitmap_scroll_bar.cc',
             'controls/scrollbar/bitmap_scroll_bar.h',
             'controls/tabbed_pane/tabbed_pane.cc',
             'controls/tabbed_pane/tabbed_pane.h',
-            'controls/table/group_table_view.cc',
-            'controls/table/group_table_view.h',
-            'controls/table/native_table_wrapper.h',
-            'controls/table/table_view.cc',
-            'controls/table/table_view.h',
-            'controls/table/table_view2.cc',
-            'controls/table/table_view2.h',
-            'controls/table/table_view_observer.h',
-            'controls/tree/tree_view.cc',
-            'controls/tree/tree_view.h',
             'drag_utils_win.cc',
+            '../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!': [
-            '../ui/views/events/event_win.cc',
             'accessibility/native_view_accessibility_win.cc',
             'controls/scrollbar/bitmap_scroll_bar.cc',
             'controls/native_control.cc',
-            'controls/table/group_table_view.cc',
-            'controls/table/table_view.cc',
-            'controls/tree/tree_view.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',
           ],
         }],
         ['use_aura==0', {
           'sources!': [
             'controls/menu/native_menu_views.cc',
             'controls/menu/native_menu_views.h',
@@ skipping 55 matching lines @@
         '../ui/ui.gyp:ui_resources_standard',
         'views',
       ],
       '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/table/table_view_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/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',
         'controls/textfield/textfield_views_model_unittest.cc',
         'controls/scrollbar/scrollbar_unittest.cc',
         'run_all_unittests.cc',
         'view_unittest.cc',
-        '../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',
 
         '<(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': [
             '../build/linux/system.gyp:gtk',
           ],
@@ skipping 14 matching lines @@
           },
           'include_dirs': [
             '../third_party/wtl/include',
           ],
         }],
         [ 'use_aura==1', {
           'dependencies': [
             '../ui/aura/aura.gyp:test_support_aura',
           ],
           'sources/': [
+            ['exclude', '../ui/views/controls/table/table_view_unittest.cc'],
+            ['exclude', '../ui/views/widget/native_widget_win_unittest.cc'],
             ['exclude', 'controls/combobox/native_combobox_views_unittest.cc'],
-            ['exclude', 'controls/table/table_view_unittest.cc'],
             ['exclude', 'controls/tabbed_pane/tabbed_pane_unittest.cc'],
-            ['exclude', '../ui/views/widget/native_widget_win_unittest.cc'],
           ],
         }, {
           'sources/': [
             ['exclude', '../ui/aura/test/test_desktop_delegate.cc'],
             ['exclude', '../ui/aura/test/test_desktop_delegate.h'],
           ],
         }],
       ],
     },
     {
@@ skipping 97 matching lines @@
           },
           'sources': [
             '../ui/views/examples/table_example.cc',
             '../ui/views/examples/table_example.h',
           ],
         }],
       ],
     },
   ],
 }