Move the desktop aura classes into a desktop subdir to make the gyp simpler.

ui/views/views.gyp

Index: ui/views/views.gyp
===================================================================
--- ui/views/views.gyp	(revision 167419)
+++ ui/views/views.gyp	(working copy)
@@ -320,30 +320,35 @@
         '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:
         'widget/desktop_aura/desktop_activation_client.cc',
         'widget/desktop_aura/desktop_activation_client.h',
         'widget/desktop_aura/desktop_cursor_client.cc',
         'widget/desktop_aura/desktop_cursor_client.h',
         'widget/desktop_aura/desktop_dispatcher_client.cc',
         'widget/desktop_aura/desktop_dispatcher_client.h',
+        'widget/desktop_aura/desktop_layout_manager.cc',
+        'widget/desktop_aura/desktop_layout_manager.h',
+        'widget/desktop_aura/desktop_native_widget_aura.cc',
+        'widget/desktop_aura/desktop_native_widget_aura.h',
+        'widget/desktop_aura/desktop_root_window_host.h',
+        'widget/desktop_aura/desktop_root_window_host_linux.cc',
+        'widget/desktop_aura/desktop_root_window_host_linux.h',
+        'widget/desktop_aura/desktop_root_window_host_win.cc',
+        'widget/desktop_aura/desktop_root_window_host_win.h',
         'widget/desktop_aura/desktop_screen.h',
+        'widget/desktop_aura/desktop_screen_position_client.cc',
+        'widget/desktop_aura/desktop_screen_position_client.h',
         'widget/desktop_aura/desktop_screen_win.cc',
         'widget/desktop_aura/desktop_screen_win.h',
         'widget/desktop_aura/desktop_screen_x11.cc',
         'widget/desktop_aura/desktop_stacking_client.cc',
         'widget/desktop_aura/desktop_stacking_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',
-        'widget/desktop_root_window_host_win.h',
-        'widget/desktop_screen_position_client.cc',
-        'widget/desktop_screen_position_client.h',
+        'widget/desktop_aura/x11_desktop_handler.cc',
+        'widget/desktop_aura/x11_desktop_handler.h',
+        'widget/desktop_aura/x11_desktop_window_move_client.cc',
+        'widget/desktop_aura/x11_desktop_window_move_client.h',
+        'widget/desktop_aura/x11_window_event_filter.cc',
+        'widget/desktop_aura/x11_window_event_filter.h',
         'widget/drop_helper.cc',
         'widget/drop_helper.h',
         'widget/drop_target_win.cc',
@@ -378,12 +383,6 @@
         'widget/widget_message_filter.cc',
         'widget/widget_message_filter.h',
         'widget/widget_observer.h',
-        'widget/x11_desktop_handler.cc',
-        'widget/x11_desktop_handler.h',
-        'widget/x11_desktop_window_move_client.cc',
-        'widget/x11_desktop_window_move_client.h',
-        'widget/x11_window_event_filter.cc',
-        'widget/x11_window_event_filter.h',
         'win/fullscreen_handler.cc',
         'win/fullscreen_handler.h',
         'win/hwnd_message_handler.cc',
@@ -446,8 +445,8 @@
                 ['include', 'ime/input_method_win.h'],
                 ['include', 'widget/desktop_aura/desktop_screen_win.cc'],
                 ['include', 'widget/desktop_aura/desktop_screen_win.h'],
-                ['include', 'widget/desktop_root_window_host_win.cc'],
-                ['include', 'widget/desktop_root_window_host_win.h'],
+                ['include', 'widget/desktop_aura/desktop_root_window_host_win.cc'],
+                ['include', 'widget/desktop_aura/desktop_root_window_host_win.h'],
               ],
             }],
           ],
@@ -455,9 +454,7 @@
         ['use_aura==0', {
           'sources/': [
             ['exclude', 'corewm'],
-            ['exclude', '/desktop_[^/]*\\.cc$'],
-            ['exclude', '/x11_[^/]*\\.cc$'],
-            ['exclude', 'widget/desktop_aura/'],
+            ['exclude', 'widget/desktop_aura'],
             ['exclude', 'widget/native_widget_aura_window_observer.cc'],
             ['exclude', 'widget/native_widget_aura_window_observer.h'],
             ['exclude', 'widget/widget_aura_utils.cc'],
@@ -466,8 +463,6 @@
         }],
         ['chromeos==1', {
           'sources/': [
-            ['exclude', '/desktop_[^/]*\\.cc$'],
-            ['exclude', 'widget/x11_*'],
             ['exclude', 'widget/desktop_aura'],
           ],
         }],