linux_aura: Compile ash into chrome.

chrome/chrome_browser_ui.gypi

 # Copyright 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.
 
 {
   'targets': [
     {
       'target_name': 'browser_ui',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 260 matching lines @@
         'browser/ui/ash/screenshot_taker.h',
         'browser/ui/ash/session_state_delegate_chromeos.cc',
         'browser/ui/ash/session_state_delegate_chromeos.h',
         'browser/ui/ash/session_state_delegate_views.cc',
         'browser/ui/ash/session_state_delegate_views.h',
         'browser/ui/ash/tabs/dock_info_ash.cc',
         'browser/ui/ash/tabs/dock_info_ash.h',
         'browser/ui/ash/tabs/dock_info_chromeos.cc',
         'browser/ui/ash/user_action_handler.cc',
         'browser/ui/ash/user_action_handler.h',
-        'browser/ui/ash/user_wallpaper_delegate_win.cc',
-        'browser/ui/ash/user_wallpaper_delegate_win.h',
+        'browser/ui/ash/solid_color_user_wallpaper_delegate.cc',

[sky, 2013/09/30 14:45:53]

nit: sort

[Elliot Glaysher, 2013/09/30 20:53:40]

I really  wish tools/git/move_source_file.py was smart enough to do this on its
own...

+        'browser/ui/ash/solid_color_user_wallpaper_delegate.h',
         'browser/ui/ash/volume_controller_chromeos.cc',
         'browser/ui/ash/volume_controller_chromeos.h',
         'browser/ui/ash/window_positioner.cc',
         'browser/ui/ash/window_positioner.h',
         'browser/ui/aura/active_desktop_monitor.cc',
         'browser/ui/aura/active_desktop_monitor.h',
         'browser/ui/aura/chrome_browser_main_extra_parts_aura.cc',
         'browser/ui/aura/chrome_browser_main_extra_parts_aura.h',
         'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.cc',
         'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h',
@@ skipping 2405 matching lines @@
         ['toolkit_views==0 or chromeos==1', {
           'sources!': [
             'browser/ui/views/message_center/message_center_frame_view.cc',
             'browser/ui/views/message_center/message_center_frame_view.h',
             'browser/ui/views/message_center/message_center_widget_delegate.h',
             'browser/ui/views/message_center/message_center_widget_delegate.cc',
             'browser/ui/views/message_center/web_notification_tray.h',
             'browser/ui/views/message_center/web_notification_tray.cc',
           ],
         }],
-        ['use_aura==1 and use_ash==0 and use_ozone==0 and OS=="linux"', {
+        ['use_aura==1 and chromeos==0 and use_ozone==0 and OS=="linux"', {
           'dependencies': [
             # gtk2 is the only component that can interact with gtk2 in our new
             # world.
             'browser/ui/libgtk2ui/libgtk2ui.gyp:gtk2ui',
             '../build/linux/system.gyp:gio',
           ],
         }],
         ['use_aura==0 or chromeos==1 or OS!="linux"', {
           'sources!': [
             'browser/ui/views/status_icons/status_icon_linux_wrapper.cc',
@@ skipping 507 matching lines @@
             'browser/ui/webui/local_discovery/local_discovery_ui.cc',
             'browser/ui/webui/local_discovery/local_discovery_ui.h',
             'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc',
             'browser/ui/webui/local_discovery/local_discovery_ui_handler.h',
           ],
         }],
       ],
     },
   ],
 }