views: Move tabbed_pane directory 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 160 matching lines @@
         'controls/scrollbar/native_scroll_bar_wrapper.h',
         'controls/scrollbar/native_scroll_bar.cc',
         'controls/scrollbar/native_scroll_bar.h',
         'controls/scrollbar/scroll_bar.cc',
         'controls/scrollbar/scroll_bar.h',
         'controls/separator.cc',
         'controls/separator.h',
         'controls/single_split_view.cc',
         '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/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',
@@ skipping 54 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/tabbed_pane/native_tabbed_pane_gtk.cc',

[M-A Ruel, 2011/11/25 19:09:32]

I guess this project will be moved eventually under ui?

[tfarina, 2011/11/25 19:18:24]

Yes, when everything is under ui/views/ I'll create a gyp file for it (probably
an ui/views/views.gypi or ui/ui_views.gypi, I'm not sure yet). Unless you have a
better idea ;)

+        '../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',
         '../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',
@@ skipping 120 matching lines @@
             ['exclude', 'controls/menu/menu_2.*'],
           ],
           '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',
             'drag_utils_win.cc',
+            '../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',
@@ skipping 87 matching lines @@
         '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/combobox/native_combobox_views_unittest.cc',
+        '../ui/views/controls/tabbed_pane/tabbed_pane_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/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',
 
         '<(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',
@@ skipping 21 matching lines @@
           'include_dirs': [
             '../third_party/wtl/include',
           ],
         }],
         [ 'use_aura==1', {
           'dependencies': [
             '../ui/aura/aura.gyp:test_support_aura',
           ],
           'sources/': [
             ['exclude', '../ui/views/controls/combobox/native_combobox_views_unittest.cc'],
+            ['exclude', '../ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc'],
             ['exclude', '../ui/views/controls/table/table_view_unittest.cc'],
             ['exclude', '../ui/views/widget/native_widget_win_unittest.cc'],
-            ['exclude', 'controls/tabbed_pane/tabbed_pane_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',
           ],
         }],
       ],
     },
   ],
 }