chrome/browser/resources/options2/chromeos/set_wallpaper_options.js - Issue 10850036: [cros] Add attribution (author & website) strings to stock user images.

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/options2/chromeos/set_wallpaper_options.js

Issue 10850036: [cros] Add attribution (author & website) strings to stock user images. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge Created 8 years, 4 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/options2/chromeos/set_wallpaper_options.html ('k') | chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/options2/chromeos/set_wallpaper_options.js

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

index 57ad71c2937e7f51da8e54e46fc5ace079249524..4f01abb6bb68f87c8261f5a5789a4965de56a081 100644

--- a/chrome/browser/resources/options2/chromeos/set_wallpaper_options.js

+++ b/chrome/browser/resources/options2/chromeos/set_wallpaper_options.js

@@ -99,13 +99,14 @@ cr.define('options', function() {

setWallpaperAttribution_: function(url) {

for (var i = 0; i < this.wallpapers_.length; i++) {

if (this.wallpapers_[i].url == url) {

- $('author-name').textContent = this.wallpapers_[i].author;

- $('author-website').textContent = this.wallpapers_[i].website;

+ $('wallpaper-author-name').textContent = this.wallpapers_[i].author;

+ $('wallpaper-author-website').textContent =

+ this.wallpapers_[i].website;

return;

}

- $('author-name').textContent = '';

- $('author-website').textContent = '';

+ $('wallpaper-author-name').textContent = '';

+ $('wallpaper-author-website').textContent = '';

/**

@@ -190,7 +191,7 @@ cr.define('options', function() {

var wallpaperGrid = $('wallpaper-grid');

if ($('use-daily-wallpaper').checked) {

wallpaperGrid.disabled = true;

- $('attribution-label').hidden = false;

+ $('wallpaper-attribution-label').hidden = false;

chrome.send('selectDailyWallpaper');

wallpaperGrid.classList.add('grayout');

$('set-wallpaper-layout').hidden = true;

@@ -270,11 +271,11 @@ cr.define('options', function() {

set isCustom(isCustom) {

if (isCustom) {

// Clear attributions for custom wallpaper.

- $('attribution-label').hidden = true;

+ $('wallpaper-attribution-label').hidden = true;

// Enable the layout drop down box when custom wallpaper is selected.

$('set-wallpaper-layout').hidden = false;

} else {

- $('attribution-label').hidden = false;

+ $('wallpaper-attribution-label').hidden = false;

$('set-wallpaper-layout').hidden = true;

}