views: Move desktop and touchui 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 308 matching lines @@
         'mouse_watcher.h',
         'native_theme_delegate.h',
         'native_theme_painter.cc',
         'native_theme_painter.h',
         'paint_lock.cc',
         'paint_lock.h',
         'painter.cc',
         'painter.h',
         'repeat_controller.cc',
         'repeat_controller.h',
-        'touchui/gesture_manager.cc',
-        'touchui/gesture_manager.h',
-        'touchui/touch_selection_controller.cc',
-        'touchui/touch_selection_controller.h',
-        'touchui/touch_selection_controller_impl.cc',
-        'touchui/touch_selection_controller_impl.h',
         'view.cc',
         'view.h',
         'view_aura.cc',
         'view_constants.cc',
         'view_constants.h',
         'view_gtk.cc',
         'view_text_utils.cc',
         'view_text_utils.h',
         'view_wayland.cc',
         'view_win.cc',
@@ skipping 44 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/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',
         '../ui/views/window/dialog_client_view.cc',
         '../ui/views/window/window/dialog_client_view.h',
         '../ui/views/window/dialog_delegate.cc',
         '../ui/views/window/dialog_delegate.h',
         '../ui/views/window/native_frame_view.cc',
         '../ui/views/window/native_frame_view.h',
@@ skipping 88 matching lines @@
         ['touchui==1', {
           'defines': ['TOUCH_UI=1'],
           'sources/': [
             ['exclude', 'focus/accelerator_handler_gtk.cc'],
             ['exclude', 'controls/menu/native_menu_gtk.cc'],
             ['exclude', 'widget/tooltip_manager_gtk.cc'],
           ],
         }],
         ['touchui==0', {
           'sources!': [
-            'touchui/touch_selection_controller_impl.cc',
-            'touchui/touch_selection_controller_impl.h',
+            '../ui/views/touchui/touch_selection_controller_impl.cc',
+            '../ui/views/touchui/touch_selection_controller_impl.h',
           ],
         }],
         ['touchui==0 and use_aura==0', {
           'sources!': [
             'controls/menu/native_menu_views.cc',
             'controls/menu/native_menu_views.h',
             'widget/tooltip_manager_views.cc',
           ],
         }],
         ['use_ibus==1', {
@@ skipping 49 matching lines @@
         '../ui/ui.gyp:ui',
         '../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',
         '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',
-        'touchui/touch_selection_controller_impl_unittest.cc',
         '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 15 matching lines @@
               'sources!': [
                 'focus/accelerator_handler_gtk_unittest.cc',
                 'controls/table/table_view_unittest.cc',
                 'controls/tabbed_pane/tabbed_pane_unittest.cc'
               ],
             }],
           ],
         }],
         ['touchui==0', {
           'sources!': [
-            'touchui/touch_selection_controller_impl_unittest.cc',
+            '../ui/views/touchui/touch_selection_controller_impl_unittest.cc',
           ],
         }],
         ['OS=="win"', {
           'link_settings': {
             'libraries': [
               '-limm32.lib',
               '-loleacc.lib',
             ]
           },
           'include_dirs': [
@@ skipping 139 matching lines @@
         '../ui/gfx/compositor/compositor.gyp:compositor',
         '../ui/ui.gyp:gfx_resources',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
         'views',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
-        'desktop/desktop_background.cc',
-        'desktop/desktop_background.h',
-        'desktop/desktop_window_manager.cc',
-        'desktop/desktop_window_manager.h',
-        'desktop/desktop_window_view.cc',
-        'desktop/desktop_window_view.h',
+        '../ui/views/desktop/desktop_background.cc',
+        '../ui/views/desktop/desktop_background.h',
+        '../ui/views/desktop/desktop_window_manager.cc',
+        '../ui/views/desktop/desktop_window_manager.h',
+        '../ui/views/desktop/desktop_window_view.cc',
+        '../ui/views/desktop/desktop_window_view.h',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
           'conditions': [
             ['linux_use_tcmalloc==1', {
                'dependencies': [
                  '../base/allocator/allocator.gyp:allocator',
@@ skipping 30 matching lines @@
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_resources_standard',
         '../ui/gfx/compositor/compositor.gyp:compositor',
         'views',
         'views_desktop_lib',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
-        'desktop/desktop_main.cc',
-        'desktop/desktop_views_delegate.cc',
-        'desktop/desktop_views_delegate.h',
+        '../ui/views/desktop/desktop_main.cc',
+        '../ui/views/desktop/desktop_views_delegate.cc',
+        '../ui/views/desktop/desktop_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',
           ],
         },
@@ skipping 64 matching lines @@
               'include_dirs': [
                 '../third_party/wtl/include',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }