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

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 302 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:
         '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',
         'widget/drop_target_win.h',
         'widget/root_view.cc',
         'widget/root_view.h',
         'widget/tooltip_manager_aura.cc',
         'widget/tooltip_manager_aura.h',
         'widget/tooltip_manager_win.cc',
         'widget/tooltip_manager_win.h',
@@ skipping 14 matching lines @@
         'widget/widget.h',
         'widget/widget_aura_utils.cc',
         'widget/widget_aura_utils.h',
         'widget/widget_delegate.cc',
         'widget/widget_delegate.h',
         'widget/widget_hwnd_utils.cc',
         'widget/widget_hwnd_utils.h',
         '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',
         'win/hwnd_message_handler.h',
         'win/hwnd_message_handler_delegate.h',
         'win/scoped_fullscreen_visibility.cc',
         'win/scoped_fullscreen_visibility.h',
         'window/client_view.cc',
         'window/client_view.h',
         'window/custom_frame_view.cc',
@@ skipping 42 matching lines @@
                 ['exclude', 'controls/scrollbar/'],
                 ['exclude', 'focus/accelerator_handler_aura.cc'],
               ],
             }],
             ['OS=="win"', {
               'sources/': [
                 ['include', 'ime/input_method_win.cc'],
                 ['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'],
               ],
             }],
           ],
         }],
         ['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'],
             ['exclude', 'widget/widget_aura_utils.h'],
           ],
         }],
         ['chromeos==1', {
           'sources/': [
-            ['exclude', '/desktop_[^/]*\\.cc$'],
-            ['exclude', 'widget/x11_*'],
             ['exclude', 'widget/desktop_aura'],
           ],
         }],
         ['use_aura==0 and OS=="win"', {
           'sources!': [
             'controls/menu/menu_config_views.cc',
             'controls/menu/menu_item_view_views.cc',
             'controls/menu/menu_separator_views.cc',
             'controls/table/group_table_view_views.cc',
             'controls/table/group_table_view_views.h',
@@ skipping 434 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
   ],
 }