chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js - Issue 16634016: Support png wallpapers

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 16634016: Support png wallpapers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 6 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_private_api.cc ('K') | « chrome/browser/chromeos/login/wallpaper_manager.cc ('k') | chrome/browser/resources/chromeos/wallpaper_manager/main.html » ('j') | chrome/browser/resources/chromeos/wallpaper_manager/main.html » ('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 01110509eb20b268160e04e25afcf77bebe03068..b9efd3be21345a8e26c7ee3c56b576785163d46b 100644

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

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

@@ -709,7 +709,8 @@ function WallpaperManager(dialogDom) {

var files = $('file-selector').files;

if (files.length != 1)

console.error('More than one files are selected or no file selected');

- if (!files[0].type.match('image/jpeg')) {

+ if (!files[0].type.match('image/jpeg') &&

+ !files[0].type.match('image/png')) {

this.showError_(str('invalidWallpaper'));

return;

}