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

ui/views/views.gyp

Index: ui/views/views.gyp
===================================================================
--- ui/views/views.gyp	(revision 165176)
+++ ui/views/views.gyp	(working copy)
@@ -29,6 +29,7 @@
         '../../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',
@@ -238,6 +239,13 @@
         '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',
@@ -316,6 +324,19 @@
         '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',
@@ -427,6 +448,8 @@
             }],
             ['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'],
@@ -437,6 +460,8 @@
         }],
         ['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'],
@@ -597,6 +622,9 @@
         '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',
@@ -649,6 +677,7 @@
           ],
         }, {
           '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'],