Revert 269892 "linux_aura: Compile ash into chrome."

trunk/src/chrome/browser/ui/ash/chrome_shell_delegate_views.cc

Index: trunk/src/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
===================================================================
--- trunk/src/chrome/browser/ui/ash/chrome_shell_delegate_views.cc	(revision 269901)
+++ trunk/src/chrome/browser/ui/ash/chrome_shell_delegate_views.cc	(working copy)
@@ -22,7 +22,6 @@
 #include "chrome/browser/sync/sync_error_notifier_factory_ash.h"
 #include "chrome/browser/ui/ash/chrome_new_window_delegate.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/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
@@ -36,6 +35,7 @@
 
 #if defined(OS_WIN)
 #include "chrome/browser/ui/ash/system_tray_delegate_win.h"
+#include "chrome/browser/ui/ash/user_wallpaper_delegate_win.h"
 #endif
 
 namespace {
@@ -149,7 +149,7 @@
     return ash::A11Y_ALERT_NONE;
   }
 
-  virtual base::TimeDelta PlayShutdownSound() const OVERRIDE {
+  base::TimeDelta PlayShutdownSound() const OVERRIDE {
     return base::TimeDelta();
   }
 
@@ -194,7 +194,11 @@
 }
 
 ash::UserWallpaperDelegate* ChromeShellDelegate::CreateUserWallpaperDelegate() {
-  return CreateSolidColorUserWallpaperDelegate();
+#if defined(OS_WIN)
+  return ::CreateUserWallpaperDelegate();
+#else
+  return NULL;
+#endif
 }
 
 void ChromeShellDelegate::Observe(int type,