Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / customization_document.cc

diff --git a/src/chrome/browser/chromeos/customization_document.cc b/src/chrome/browser/chromeos/customization_document.cc
index 5edc590..992bdf7 100644 (file)
--- a/src/chrome/browser/chromeos/customization_document.cc
+++ b/src/chrome/browser/chromeos/customization_document.cc
@@ -25,7 +25,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/customization_wallpaper_downloader.h"
 #include "chrome/browser/chromeos/extensions/default_app_order.h"
-#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/net/delay_network_call.h"
 #include "chrome/browser/extensions/external_loader.h"
@@ -45,6 +44,10 @@
 #include "net/url_request/url_fetcher.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#if !defined(USE_ATHENA)
+#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
+#endif
+
 using content::BrowserThread;
 
 namespace chromeos {
@@ -172,7 +175,7 @@ class ServicesCustomizationExternalLoader
   }
 
   // Implementation of extensions::ExternalLoader:
-  virtual void StartLoading() OVERRIDE {
+  virtual void StartLoading() override {
     if (!is_apps_set_) {
       ServicesCustomizationDocument::GetInstance()->StartFetching();
       // In case of missing customization ID, SetCurrentApps will be called
@@ -938,10 +941,12 @@ void ServicesCustomizationDocument::OnOEMWallpaperDownloaded(
     VLOG(1) << "Setting default wallpaper to '"
             << GetCustomizedWallpaperDownloadedFileName().value() << "' ('"
             << wallpaper_url.spec() << "')";
+#if !defined(USE_ATHENA)
     WallpaperManager::Get()->SetCustomizedDefaultWallpaper(
         wallpaper_url,
         GetCustomizedWallpaperDownloadedFileName(),
         GetCustomizedWallpaperCacheDir());
+#endif
   }
   wallpaper_downloader_.reset();
   applying->Finished(success);