linux_aura: Compile ash into chrome.

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 "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"
 #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/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/user_wallpaper_delegate_win.h"
-#endif
-
 bool ChromeShellDelegate::IsFirstRunAfterBoot() const {
   return false;
 }
 
 void ChromeShellDelegate::PreInit() {
 }
 
 void ChromeShellDelegate::Shutdown() {
 }
 
@@ skipping 63 matching lines @@
 
 void ChromeShellDelegate::SilenceSpokenFeedback() const {
 }
 
 ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() {
   // TODO(sky): need to subclass and override Shutdown() in a meaningful way.
   return new ash::DefaultSystemTrayDelegate;
 }
 
 ash::UserWallpaperDelegate* ChromeShellDelegate::CreateUserWallpaperDelegate() {
-#if defined(OS_WIN)
-  return ::CreateUserWallpaperDelegate();
-#else
-  return NULL;
-#endif
+  return CreateSolidColorUserWallpaperDelegate();
 }
 
 void ChromeShellDelegate::HandleMediaNextTrack() {
 }
 
 void ChromeShellDelegate::HandleMediaPlayPause() {
 }
 
 void ChromeShellDelegate::HandleMediaPrevTrack() {
 }
 
 void ChromeShellDelegate::Observe(int type,
                                   const content::NotificationSource& source,
                                   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
       // and open a new tab page, if session restore is not on.
       BrowserList* desktop_list = BrowserList::GetInstance(
           chrome::HOST_DESKTOP_TYPE_NATIVE);
       if (desktop_list->empty()) {
         // We pass a dummy command line here, because the browser is launched in
         // silent-mode by the metro viewer process, which causes the
         // StartupBrowserCreatorImpl class to not create any browsers which is
@@ skipping 24 matching lines @@
 void ChromeShellDelegate::PlatformInit() {
 #if defined(OS_WIN)
   registrar_.Add(this,
                  chrome::NOTIFICATION_ASH_SESSION_STARTED,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_ASH_SESSION_ENDED,
                  content::NotificationService::AllSources());
 #endif
 }