chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js - Issue 1004263002: Disable surprise me automatically if the current wallpaper was set by a third party application.

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 1004263002: Disable surprise me automatically if the current wallpaper was set by a third party application. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address the code review comments. Created 5 years, 9 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

« chrome/browser/chromeos/extensions/wallpaper_api.cc ('K') | « chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_images_grid.js ('k') | chrome/browser/resources/chromeos/wallpaper_manager/main.html » ('j') | chrome/browser/resources/chromeos/wallpaper_manager/manifest.json » ('J')
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 57af6ad1302f728708f9a918fdd3c5856cc391e3..5d638ecbc448f4446ec4fd6cd1d751026ef33548 100644

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

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

@@ -203,12 +203,16 @@ function WallpaperManager(dialogDom) {

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

if (shouldEnable) {

checkbox.classList.add('checked');

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

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

} else {

// Unchecking the "Surprise me" checkbox falls back to the previous

// wallpaper before "Surprise me" was turned on.

- self.setSelectedWallpaper_(self.wallpaperGrid_.activeItem_);

- self.onWallpaperChanged_(self.wallpaperGrid_.activeItem_,

- self.currentWallpaper_);

+ if (self.wallpaperGrid_.activeItem) {

+ self.setSelectedWallpaper_(self.wallpaperGrid_.activeItem);

+ self.onWallpaperChanged_(self.wallpaperGrid_.activeItem,

+ self.currentWallpaper_);

+ }

checkbox.classList.remove('checked');

}

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