linux_aura: Compile ash into chrome.

chrome/chrome_browser_ui.gypi

Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index fa5f975d5a62839438b9fcdc25ffd7ee31aa57a2..9dffc77930ddbb134cdd812617fafbdd476b82b4 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -278,8 +278,8 @@
         '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',
@@ -2705,7 +2705,7 @@
             '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.