chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js - Issue 1227413005: Disable Delete option for custom wallpapers when 'Surprise Me' is enabled.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js

Issue 1227413005: Disable Delete option for custom wallpapers when 'Surprise Me' is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Reverted the combination.... Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/chromeos/wallpaper_manager/css/wallpaper_manager.css ('k') | chrome/browser/resources/chromeos/wallpaper_manager/main.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js

diff --git a/chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js b/chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js

index b82d5cdce3ca21fa79a2eec14bd6761904ced6db..357dbfeb6e9818e6e6902ecd0a75270f78bd7f6a 100644

--- a/chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js

+++ b/chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js

@@ -202,6 +202,7 @@ function WallpaperManager(dialogDom) {

var onSuccess = function() {

if (chrome.runtime.lastError == null) {

if (shouldEnable) {

+ self.document_.body.removeAttribute('surprise-me-disabled');

checkbox.classList.add('checked');

// Hides the wallpaper set by message if there is any.

$('wallpaper-set-by-message').textContent = '';

@@ -214,6 +215,7 @@ function WallpaperManager(dialogDom) {

self.currentWallpaper_);

}

checkbox.classList.remove('checked');

+ self.document_.body.setAttribute('surprise-me-disabled', '');

}

$('categories-list').disabled = shouldEnable;

$('wallpaper-grid').disabled = shouldEnable;

@@ -281,6 +283,7 @@ function WallpaperManager(dialogDom) {

if (this.enableOnlineWallpaper_) {

var self = this;

+ self.document_.body.setAttribute('surprise-me-disabled', '');

$('surprise-me').hidden = false;

$('surprise-me').addEventListener('click',

this.toggleSurpriseMe_.bind(this));

@@ -288,6 +291,7 @@ function WallpaperManager(dialogDom) {

$('surprise-me').querySelector('#checkbox').classList.add('checked');

$('categories-list').disabled = true;

$('wallpaper-grid').disabled = true;

+ self.document_.body.removeAttribute('surprise-me-disabled');

};

WallpaperUtil.enabledSyncThemesCallback(function(syncEnabled) {