summaryrefslogtreecommitdiff
path: root/chromium/chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js')
-rw-r--r--chromium/chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js9
1 files changed, 4 insertions, 5 deletions
diff --git a/chromium/chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js b/chromium/chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js
index f490701afb1..8c6c867a3c4 100644
--- a/chromium/chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js
+++ b/chromium/chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js
@@ -1004,14 +1004,13 @@ function WallpaperManager(dialogDom) {
};
var self = this;
- // Need this check for test purpose.
- var numOnlineWallpaper = (this.enableOnlineWallpaper_ && this.manifest_) ?
- this.manifest_.wallpaper_list.length : 0;
var processResults = function(entries) {
for (var i = 0; i < entries.length; i++) {
var entry = entries[i];
var wallpaperInfo = {
- wallpaperId: numOnlineWallpaper + i,
+ // Set wallpaperId to null to avoid duplicate thumbnail images,
+ // see crbug.com/506135 for details.
+ wallpaperId: null,
baseURL: entry.name,
// The layout will be replaced by the actual value saved in
// local storage when requested later. Layout is not important
@@ -1026,7 +1025,7 @@ function WallpaperManager(dialogDom) {
}
if (loadTimeData.getBoolean('isOEMDefaultWallpaper')) {
var oemDefaultWallpaperElement = {
- wallpaperId: numOnlineWallpaper + entries.length,
+ wallpaperId: null,
baseURL: 'OemDefaultWallpaper',
layout: 'CENTER_CROPPED',
source: Constants.WallpaperSourceEnum.OEM,