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

views/views.gyp

Index: views/views.gyp
diff --git a/views/views.gyp b/views/views.gyp
index 088388f520ae2578fd250d5489319561f4755a7b..1e752136853092ae7f67167c52637930f26081ed 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -68,16 +68,6 @@
         'controls/button/radio_button.h',
         'controls/button/text_button.cc',
         'controls/button/text_button.h',
-        'controls/combobox/combobox.cc',
-        'controls/combobox/combobox.h',
-        'controls/combobox/combobox_listener.h',
-        'controls/combobox/native_combobox_gtk.cc',
-        'controls/combobox/native_combobox_gtk.h',
-        'controls/combobox/native_combobox_views.cc',
-        'controls/combobox/native_combobox_views.h',
-        'controls/combobox/native_combobox_win.cc',
-        'controls/combobox/native_combobox_win.h',
-        'controls/combobox/native_combobox_wrapper.h',
         'controls/focusable_border.cc',
         'controls/focusable_border.h',
         'controls/image_view.cc',
@@ -260,6 +250,16 @@
         '../ui/views/bubble/bubble_delegate.h',
         '../ui/views/bubble/bubble_frame_view.cc',
         '../ui/views/bubble/bubble_frame_view.h',
+        '../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/table/native_table_wrapper.h',
         '../ui/views/controls/table/native_table_gtk.cc',
         '../ui/views/controls/table/native_table_gtk.h',
@@ -509,6 +509,7 @@
         '../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/table/table_view_unittest.cc',
         '../ui/views/events/event_unittest.cc',
         '../ui/views/focus/accelerator_handler_gtk_unittest.cc',
@@ -535,7 +536,6 @@
         'controls/progress_bar_unittest.cc',
         'controls/single_split_view_unittest.cc',
         'controls/tabbed_pane/tabbed_pane_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',
@@ -576,9 +576,9 @@
             '../ui/aura/aura.gyp:test_support_aura',
           ],
           'sources/': [
+            ['exclude', '../ui/views/controls/combobox/native_combobox_views_unittest.cc'],
             ['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/tabbed_pane/tabbed_pane_unittest.cc'],
           ],
         }, {