linux_aura: Compile ash into chrome.

chrome/browser/ui/ash/chrome_shell_delegate_views.cc

Index: chrome/browser/ui/ash/chrome_shell_delegate_views.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
index 1b01998f60728f050836899bdc49b52d96c8445e..ba2e5bf72b615de2c8360c6db1d96ab75811c367 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
@@ -4,14 +4,15 @@
 
 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 
-#include "base/command_line.h"
 #include "ash/magnifier/magnifier_constants.h"
 #include "ash/system/tray/default_system_tray_delegate.h"
+#include "base/command_line.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/caps_lock_delegate_views.h"
 #include "chrome/browser/ui/ash/session_state_delegate_views.h"
+#include "chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.h"
 #include "chrome/browser/ui/ash/window_positioner.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
@@ -22,10 +23,6 @@
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_service.h"
 
-#if defined(OS_WIN)
-#include "chrome/browser/ui/ash/user_wallpaper_delegate_win.h"
-#endif
-
 bool ChromeShellDelegate::IsFirstRunAfterBoot() const {
   return false;
 }
@@ -109,11 +106,7 @@ ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() {
 }
 
 ash::UserWallpaperDelegate* ChromeShellDelegate::CreateUserWallpaperDelegate() {
-#if defined(OS_WIN)
-  return ::CreateUserWallpaperDelegate();
-#else
-  return NULL;
-#endif
+  return CreateSolidColorUserWallpaperDelegate();
 }
 
 void ChromeShellDelegate::HandleMediaNextTrack() {
@@ -130,12 +123,14 @@ void ChromeShellDelegate::Observe(int type,
                                   const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_ASH_SESSION_STARTED: {
+#if defined(OS_WIN)
       // If we are launched to service a windows 8 search request then let the
       // IPC which carries the search string create the browser and initiate
       // the navigation.
       if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kWindows8Search))
         break;
+#endif
       // If Chrome ASH is launched when no browser is open in the desktop,
       // we should execute the startup code.
       // If there are browsers open in the desktop, we create a browser window