Move aura shared and desktop classes to the views target. Note that the files don't actually move, …

ui/views/views.gyp

 # Copyright (c) 2012 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 11 matching lines @@
       'target_name': 'views',
       'type': '<(component)',
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/base.gyp:base_i18n',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../../build/temp_gyp/googleurl.gyp:googleurl',
         '../../skia/skia.gyp:skia',
         '../../third_party/icu/icu.gyp:icui18n',
         '../../third_party/icu/icu.gyp:icuuc',
+        '../aura/aura.gyp:aura',
         '../base/strings/ui_strings.gyp:ui_strings',
         '../compositor/compositor.gyp:compositor',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
       ],
       'defines': [
         'VIEWS_IMPLEMENTATION',
       ],
       'sources': [
         # All .cc, .h under views, except unittests
@@ skipping 189 matching lines @@
         'controls/textfield/textfield_views_model.h',
         'controls/throbber.cc',
         'controls/throbber.h',
         'controls/tree/tree_view.h',
         'controls/tree/tree_view_controller.cc',
         'controls/tree/tree_view_controller.h',
         'controls/tree/tree_view_views.cc',
         'controls/tree/tree_view_views.h',
         'controls/tree/tree_view_win.cc',
         'controls/tree/tree_view_win.h',
+        # TODO(beng): rename to 'corewm/' hence this sort order:
+        '../aura/shared/compound_event_filter.cc',
+        '../aura/shared/compound_event_filter.h',
+        '../aura/shared/input_method_event_filter.cc',
+        '../aura/shared/input_method_event_filter.h',
+        '../aura/shared/root_window_capture_client.cc',
+        '../aura/shared/root_window_capture_client.h',
         'debug_utils.cc',
         'debug_utils.h',
         'drag_controller.h',
         'drag_utils.cc',
         'drag_utils.h',
         'focus/accelerator_handler.h',
         'focus/accelerator_handler_aura.cc',
         'focus/accelerator_handler_win.cc',
         'focus/external_focus_tracker.cc',
         'focus/external_focus_tracker.h',
@@ skipping 58 matching lines @@
         'view_text_utils.cc',
         'view_text_utils.h',
         'view_win.cc',
         'views_delegate.h',
         'widget/aero_tooltip_manager.cc',
         'widget/aero_tooltip_manager.h',
         'widget/child_window_message_processor.cc',
         'widget/child_window_message_processor.h',
         'widget/default_theme_provider.cc',
         'widget/default_theme_provider.h',
+        # TODO(beng): rename to 'widget/desktop_aura/' hence this sort order:
+        '../aura/desktop/desktop_activation_client.cc',
+        '../aura/desktop/desktop_activation_client.h',
+        '../aura/desktop/desktop_cursor_client.cc',
+        '../aura/desktop/desktop_cursor_client.h',
+        '../aura/desktop/desktop_dispatcher_client.cc',
+        '../aura/desktop/desktop_dispatcher_client.h',
+        '../aura/desktop/desktop_screen.h',
+        '../aura/desktop/desktop_screen_win.cc',
+        '../aura/desktop/desktop_screen_win.h',
+        '../aura/desktop/desktop_screen_x11.cc',
+        '../aura/desktop/desktop_stacking_client.cc',
+        '../aura/desktop/desktop_stacking_client.h',
         'widget/desktop_capture_client.cc',
         'widget/desktop_capture_client.h',
         'widget/desktop_layout_manager.cc',
         'widget/desktop_layout_manager.h',
         'widget/desktop_native_widget_aura.cc',
         'widget/desktop_native_widget_aura.h',
         'widget/desktop_root_window_host.h',
         'widget/desktop_root_window_host_linux.cc',
         'widget/desktop_root_window_host_linux.h',
         'widget/desktop_root_window_host_win.cc',
@@ skipping 91 matching lines @@
             ['OS=="mac"', {
               'sources/': [
                 ['exclude', 'mouse_watcher.cc'],
                 ['exclude', 'controls/menu/*'],
                 ['exclude', 'controls/scrollbar/*'],
                 ['exclude', 'focus/accelerator_handler_aura.cc'],
               ],
             }],
             ['OS=="win"', {
               'sources/': [
+                ['include', '../aura/desktop/desktop_screen_win.cc'],
+                ['include', '../aura/desktop/desktop_screen_win.h'],
                 ['include', 'ime/input_method_win.cc'],
                 ['include', 'ime/input_method_win.h'],
                 ['include', 'widget/desktop_root_window_host_win.cc'],
                 ['include', 'widget/desktop_root_window_host_win.h'],
               ],
             }],
           ],
         }],
         ['use_aura==0', {
           'sources/': [
+            ['exclude', '../aura/shared/*'],
+            ['exclude', '../aura/desktop/*'],

[scottmg, 2012/10/31 18:01:05]

sources/ is a regex, so either drop the * or make it .*

             ['exclude', '/desktop_[^/]*\\.cc$'],
             ['exclude', '/x11_[^/]*\\.cc$'],
             ['exclude', 'widget/native_widget_aura_window_observer.cc'],
             ['exclude', 'widget/native_widget_aura_window_observer.h'],
             ['exclude', 'widget/widget_aura_utils.cc'],
             ['exclude', 'widget/widget_aura_utils.h'],
           ],
         }],
         ['chromeos==1', {
           'sources/': [
@@ skipping 140 matching lines @@
         'controls/native/native_view_host_unittest.cc',
         'controls/progress_bar_unittest.cc',
         'controls/scrollbar/scrollbar_unittest.cc',
         'controls/single_split_view_unittest.cc',
         'controls/slider_unittest.cc',
         'controls/tabbed_pane/tabbed_pane_unittest.cc',
         'controls/table/table_view_unittest.cc',
         'controls/textfield/native_textfield_views_unittest.cc',
         'controls/textfield/textfield_views_model_unittest.cc',
         'controls/tree/tree_view_views_unittest.cc',
+        # TODO(beng): rename 'corewm/' hence this sort order
+        '../aura/shared/compound_event_filter_unittest.cc',
+        '../aura/shared/input_method_event_filter_unittest.cc',
         'focus/focus_manager_test.h',
         'focus/focus_manager_test.cc',
         'focus/focus_manager_unittest.cc',
         'focus/focus_manager_unittest_win.cc',
         'focus/focus_traversal_unittest.cc',
         'layout/box_layout_unittest.cc',
         'layout/grid_layout_unittest.cc',
         'view_model_unittest.cc',
         'view_model_utils_unittest.cc',
         'view_unittest.cc',
@@ skipping 32 matching lines @@
         [ 'use_aura==1', {
           'dependencies': [
             '../aura/aura.gyp:test_support_aura',
           ],
           'sources/': [
             ['exclude', 'controls/table/table_view_unittest.cc'],
             ['exclude', 'widget/native_widget_win_unittest.cc'],
           ],
         }, {
           'sources/': [
+            ['exclude', '../aura/shared/*'],

[scottmg, 2012/10/31 18:01:05]

same

             ['exclude', '../aura/test/test_desktop_delegate.cc'],
             ['exclude', '../aura/test/test_desktop_delegate.h'],
             ['exclude', 'widget/native_widget_aura_unittest.cc'],
           ],
         }],
       ],
     },  # target_name: views_unittests
     {
       'target_name': 'views_examples_lib',
       'type': '<(component)',
@@ skipping 222 matching lines @@
           'sources/': [
             # This is needed because the aura rule strips it from the default
             # sources list.
             ['include', '^../../content/app/startup_helper_win.cc'],
           ],
         }],
       ],
     },  # target_name: views_examples_with_content_exe
   ],
 }