Revert 269892 "linux_aura: Compile ash into chrome."

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

 // Copyright 2013 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.
 
 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 
 #include <vector>
 
 #include "ash/accessibility_delegate.h"
 #include "ash/magnifier/magnifier_constants.h"
 #include "ash/media_delegate.h"
 #include "ash/system/tray/default_system_tray_delegate.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "chrome/browser/accessibility/accessibility_events.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/signin_error_notifier_factory_ash.h"
 #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"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_service.h"
 
 #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 {
 
 class NewWindowDelegateImpl : public ChromeNewWindowDelegate {
  public:
   NewWindowDelegateImpl() {}
   virtual ~NewWindowDelegateImpl() {}
 
   // Overridden from ash::NewWindowDelegate:
@@ skipping 93 matching lines @@
   }
 
   virtual void TriggerAccessibilityAlert(
       ash::AccessibilityAlert alert) OVERRIDE {
   }
 
   virtual ash::AccessibilityAlert GetLastAccessibilityAlert() OVERRIDE {
     return ash::A11Y_ALERT_NONE;
   }
 
-  virtual base::TimeDelta PlayShutdownSound() const OVERRIDE {
+  base::TimeDelta PlayShutdownSound() const OVERRIDE {
     return base::TimeDelta();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EmptyAccessibilityDelegate);
 };
 
 }  // namespace
 
 bool ChromeShellDelegate::IsFirstRunAfterBoot() const {
@@ skipping 24 matching lines @@
 #else
   return new ash::DefaultSystemTrayDelegate;
 #endif
 }
 
 ash::AccessibilityDelegate* ChromeShellDelegate::CreateAccessibilityDelegate() {
   return new EmptyAccessibilityDelegate;
 }
 
 ash::UserWallpaperDelegate* ChromeShellDelegate::CreateUserWallpaperDelegate() {
-  return CreateSolidColorUserWallpaperDelegate();
+#if defined(OS_WIN)
+  return ::CreateUserWallpaperDelegate();
+#else
+  return NULL;
+#endif
 }
 
 void ChromeShellDelegate::Observe(int type,
                                   const content::NotificationSource& source,
                                   const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_PROFILE_ADDED: {
       // Start the error notifier services to show sync/auth notifications.
       Profile* profile = content::Source<Profile>(source).ptr();
       SigninErrorNotifierFactory::GetForProfile(profile);
@@ skipping 67 matching lines @@
                  chrome::NOTIFICATION_PROFILE_ADDED,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_ASH_SESSION_STARTED,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_ASH_SESSION_ENDED,
                  content::NotificationService::AllSources());
 #endif
 }