views: Move ime and test directories to ui/views.

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 266 matching lines @@
         'focus/focus_manager.cc',
         'focus/focus_manager.h',
         'focus/focus_manager_factory.cc',
         'focus/focus_manager_factory.h',
         'focus/focus_search.cc',
         'focus/focus_search.h',
         'focus/view_storage.cc',
         'focus/view_storage.h',
         'focus/widget_focus_manager.cc',
         'focus/widget_focus_manager.h',
-        'ime/input_method.h',
-        'ime/input_method_delegate.h',
-        'ime/input_method_base.cc',
-        'ime/input_method_base.h',
-        'ime/input_method_gtk.cc',
-        'ime/input_method_gtk.h',
-        'ime/input_method_ibus.cc',
-        'ime/input_method_ibus.h',
-        'ime/input_method_wayland.cc',
-        'ime/input_method_wayland.h',
-        'ime/input_method_win.cc',
-        'ime/input_method_win.h',
-        'ime/mock_input_method.cc',
-        'ime/mock_input_method.h',
-        'ime/text_input_type_tracker.h',
-        'ime/text_input_type_tracker.cc',
         'layout/box_layout.cc',
         'layout/box_layout.h',
         'layout/fill_layout.cc',
         'layout/fill_layout.h',
         'layout/grid_layout.cc',
         'layout/grid_layout.h',
         'layout/layout_constants.h',
         'layout/layout_manager.cc',
         'layout/layout_manager.h',
         'metrics.cc',
@@ skipping 70 matching lines @@
         'widget/widget.cc',
         'widget/widget.h',
         'widget/widget_delegate.cc',
         'widget/widget_delegate.h',
         'widget/window_manager.cc',
         'widget/window_manager.h',
         '../ui/views/animation/bounds_animator.cc',
         '../ui/views/animation/bounds_animator.h',
         '../ui/views/accessibility/native_view_accessibility_win.cc',
         '../ui/views/accessibility/native_view_accessibility_win.h',
+        '../ui/views/ime/input_method_base.cc',
+        '../ui/views/ime/input_method_base.h',
+        '../ui/views/ime/input_method_delegate.h',
+        '../ui/views/ime/input_method_gtk.cc',
+        '../ui/views/ime/input_method_gtk.h',
+        '../ui/views/ime/input_method.h',
+        '../ui/views/ime/input_method_ibus.cc',
+        '../ui/views/ime/input_method_ibus.h',
+        '../ui/views/ime/input_method_wayland.cc',
+        '../ui/views/ime/input_method_wayland.h',
+        '../ui/views/ime/input_method_win.cc',
+        '../ui/views/ime/input_method_win.h',
+        '../ui/views/ime/mock_input_method.cc',
+        '../ui/views/ime/mock_input_method.h',
+        '../ui/views/ime/text_input_type_tracker.cc',
+        '../ui/views/ime/text_input_type_tracker.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/touchui/touch_selection_controller_impl.cc',
         '../ui/views/touchui/touch_selection_controller_impl.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',
@@ skipping 110 matching lines @@
             'controls/menu/native_menu_views.cc',
             'controls/menu/native_menu_views.h',
             'widget/tooltip_manager_views.cc',
           ],
         }],
         ['use_ibus==1', {
           'dependencies': [
             '../build/linux/system.gyp:ibus',
           ],
           'sources/': [
-            ['exclude', 'ime/mock_input_method.cc'],
-            ['exclude', 'ime/mock_input_method.h'],
+            ['exclude', '../ui/views/ime/mock_input_method.cc'],
+            ['exclude', '../ui/views/ime/mock_input_method.h'],
           ],
         }, { # else: use_ibus != 1
           'sources/': [
-            ['exclude', 'ime/input_method_ibus.cc'],
-            ['exclude', 'ime/input_method_ibus.h'],
+            ['exclude', '../ui/views/ime/input_method_ibus.cc'],
+            ['exclude', '../ui/views/ime/input_method_ibus.h'],
           ],
         }],
         ['OS=="win"', {
           'dependencies': [
             # For accessibility
             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
           ],
           'include_dirs': [
             '../third_party/wtl/include',
           ],
@@ skipping 29 matching lines @@
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_resources_standard',
         'views',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         '../ui/views/animation/bounds_animator_unittest.cc',
         '../ui/views/touchui/touch_selection_controller_impl_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',
         'accessible_pane_view_unittest.cc',
         'bubble/bubble_delegate_unittest.cc',
         'bubble/bubble_frame_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',
         'events/event_unittest.cc',
         'focus/accelerator_handler_gtk_unittest.cc',
         'focus/focus_manager_unittest.cc',
         'layout/grid_layout_unittest.cc',
         'layout/box_layout_unittest.cc',
-        'test/views_test_base.cc',
-        'test/views_test_base.h',
         'run_all_unittests.cc',
-        'test/test_views_delegate.cc',
-        'test/test_views_delegate.h',
         'view_unittest.cc',
         'widget/native_widget_test_utils.h',
         'widget/native_widget_test_utils_aura.cc',
         'widget/native_widget_test_utils_gtk.cc',
         'widget/native_widget_test_utils_win.cc',
         'widget/native_widget_unittest.cc',
         'widget/native_widget_win_unittest.cc',
         'widget/widget_unittest.cc',
 
         '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
@@ skipping 114 matching lines @@
         '../ui/views/examples/table2_example.cc',
         '../ui/views/examples/table2_example.h',
         '../ui/views/examples/text_example.cc',
         '../ui/views/examples/text_example.h',
         '../ui/views/examples/textfield_example.cc',
         '../ui/views/examples/textfield_example.h',
         '../ui/views/examples/throbber_example.cc',
         '../ui/views/examples/throbber_example.h',
         '../ui/views/examples/widget_example.cc',
         '../ui/views/examples/widget_example.h',
-        'test/test_views_delegate.cc',
-        'test/test_views_delegate.h',
+        '../ui/views/test/test_views_delegate.cc',
+        '../ui/views/test/test_views_delegate.h',
         '<(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',
           ],
           'conditions': [
@@ skipping 182 matching lines @@
               'include_dirs': [
                 '../third_party/wtl/include',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }