views: Move tabbed_pane directory to ui/views/controls/.

views/views.gyp

Index: views/views.gyp
diff --git a/views/views.gyp b/views/views.gyp
index 1e752136853092ae7f67167c52637930f26081ed..c98573ac1aa1a8b89e7d80242f2f1ce3fb3049b6 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -178,14 +178,6 @@
         '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',
@@ -260,6 +252,14 @@
         '../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',
+        '../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',
@@ -400,9 +400,9 @@
             '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',
@@ -510,6 +510,7 @@
         '../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',
@@ -535,7 +536,6 @@
         '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',
@@ -577,9 +577,9 @@
           ],
           '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/': [