| Index: chrome/browser/chromeos/settings/device_settings_provider.cc
|
| diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| index 6775222ec8d733ab7244b512f33a317f0a900dec..05a60523c12afef61c0f311c9208379d6a904a82 100644
|
| --- a/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| +++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| @@ -11,6 +11,7 @@
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| #include "base/callback.h"
|
| +#include "base/json/json_reader.h"
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| #include "base/metrics/histogram_macros.h"
|
| @@ -64,6 +65,7 @@ const char* const kKnownSettings[] = {
|
| kDeviceDisabledMessage,
|
| kDeviceOwner,
|
| kDeviceQuirksDownloadEnabled,
|
| + kDeviceWallpaperImage,
|
| kDisplayRotationDefault,
|
| kExtensionCacheSize,
|
| kHeartbeatEnabled,
|
| @@ -523,6 +525,14 @@ void DecodeGenericPolicies(
|
| kDeviceQuirksDownloadEnabled,
|
| policy.quirks_download_enabled().quirks_download_enabled());
|
| }
|
| +
|
| + if (policy.has_device_wallpaper_image() &&
|
| + policy.device_wallpaper_image().has_device_wallpaper_image()) {
|
| + std::unique_ptr<base::DictionaryValue> dict_val =
|
| + base::DictionaryValue::From(base::JSONReader::Read(
|
| + policy.device_wallpaper_image().device_wallpaper_image()));
|
| + new_values_cache->SetValue(kDeviceWallpaperImage, std::move(dict_val));
|
| + }
|
| }
|
|
|
| void DecodeLogUploadPolicies(const em::ChromeDeviceSettingsProto& policy,
|
|
|