Commit 220dcd93 authored by Kyle Milka's avatar Kyle Milka Committed by Commit Bot

[NTP] Remove special handling of solid color backgrounds

Now that image previews are supported this special
handling is no longer needed.

Bug: 854028
Change-Id: I51719b6dd7d53e3212034b2a9f69cc36db7518f8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1661482Reviewed-by: default avatarKristi Park <kristipark@chromium.org>
Commit-Queue: Kyle Milka <kmilka@chromium.org>
Cr-Commit-Position: refs/heads/master@{#669818}
parent 0c811524
......@@ -897,23 +897,13 @@ customize.showImageSelectionDialog = function(dialogTitle) {
for (let i = 0; i < collImg.length; ++i) {
const dataset = {};
// TODO(crbug.com/854028): Remove this hardcoded check when wallpaper
// previews are supported.
if (collImg[i].collectionId === 'solidcolors') {
dataset.attributionLine1 = '';
dataset.attributionLine2 = '';
dataset.attributionActionUrl = '';
} else {
dataset.attributionLine1 =
(collImg[i].attributions[0] !== undefined ?
collImg[i].attributions[0] :
'');
dataset.attributionLine2 =
(collImg[i].attributions[1] !== undefined ?
collImg[i].attributions[1] :
'');
dataset.attributionActionUrl = collImg[i].attributionActionUrl;
}
dataset.attributionLine1 =
(collImg[i].attributions[0] !== undefined ? collImg[i].attributions[0] :
'');
dataset.attributionLine2 =
(collImg[i].attributions[1] !== undefined ? collImg[i].attributions[1] :
'');
dataset.attributionActionUrl = collImg[i].attributionActionUrl;
dataset.url = collImg[i].imageUrl;
dataset.tileNum = i;
......@@ -959,15 +949,8 @@ customize.showImageSelectionDialog = function(dialogTitle) {
* loading.
*/
customize.loadTile = function(tile, imageData, countLoad) {
if (imageData[tile.dataset.tileNum].collectionId === 'solidcolors') {
tile.style.backgroundImage = [
customize.CUSTOM_BACKGROUND_OVERLAY,
'url(' + imageData[tile.dataset.tileNum].thumbnailImageUrl + ')'
].join(',').trim();
} else {
tile.style.backgroundImage =
'url(' + imageData[tile.dataset.tileNum].thumbnailImageUrl + ')';
}
tile.style.backgroundImage =
'url(' + imageData[tile.dataset.tileNum].thumbnailImageUrl + ')';
customize.fadeInImageTile(
tile, imageData[tile.dataset.tileNum].thumbnailImageUrl, countLoad);
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment