views: Move combobox 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 50 matching lines @@
         'controls/button/custom_button.cc',
         'controls/button/custom_button.h',
         'controls/button/image_button.cc',
         'controls/button/image_button.h',
         'controls/button/menu_button.cc',
         'controls/button/menu_button.h',
         'controls/button/radio_button.cc',
         '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',
         'controls/image_view.h',
         'controls/label.cc',
         'controls/label.h',
         'controls/link.cc',
         'controls/link.h',
         'controls/link_listener.h',
         'controls/menu/menu.cc',
@@ skipping 162 matching lines @@
         '../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/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',
         '../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 229 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/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',
         '../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/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',
 
         '<(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 20 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/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'],
           ],
         }, {
           'sources/': [
             ['exclude', '../ui/aura/test/test_desktop_delegate.cc'],
             ['exclude', '../ui/aura/test/test_desktop_delegate.h'],
           ],
         }],
       ],
     },
@@ skipping 98 matching lines @@
           },
           'sources': [
             '../ui/views/examples/table_example.cc',
             '../ui/views/examples/table_example.h',
           ],
         }],
       ],
     },
   ],
 }