Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(331)

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

Issue 12334030: New custom wallpaper picker UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
Index: chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_images_grid.js
diff --git a/chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_images_grid.js b/chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_images_grid.js
index cce2adaada45ce2a7c0d2a28421b6712e380ec48..2b73a29bd7319d8e5a6b64a3da17c3e401f518fa 100644
--- a/chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_images_grid.js
+++ b/chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_images_grid.js
@@ -12,10 +12,11 @@ cr.define('wallpapers', function() {
/**
* Creates a new wallpaper thumbnails grid item.
- * @param {{baseURL: string, dynamicURL: string, layout: string,
- * author: string, authorWebsite: string, availableOffline: boolean}}
- * wallpaperInfo Wallpaper baseURL, dynamicURL, layout, author and
- * author website.
+ * @param {{baseURL: string, layout: string, source: string,
+ * availableOffline: boolean, opt_dynamicURL: string,
+ * opt_author: string, opt_authorWebsite: string}}
+ * wallpaperInfo Wallpaper data item in WallpaperThumbnailsGrid's data
+ * model.
* @constructor
* @extends {cr.ui.GridItem}
*/
@@ -39,8 +40,17 @@ cr.define('wallpapers', function() {
imageEl.offline = this.dataItem.availableOffline;
this.appendChild(imageEl);
bshe 2013/02/26 19:07:26 This element is the grid element responsible for o
+ if (this.dataItem.source == 'ADDNEW') {
+ this.id = 'add-new';
+ this.addEventListener('click', function(e) {
+ $('wallpaper-selection-container').hidden = false;
+ });
+ return;
+ }
+
var self = this;
- chrome.wallpaperPrivate.getThumbnail(this.dataItem.baseURL, 'ONLINE',
+ chrome.wallpaperPrivate.getThumbnail(this.dataItem.baseURL,
+ this.dataItem.source,
function(data) {
if (data) {
var blob = new Blob([new Int8Array(data)], {'type' : 'image\/png'});
@@ -48,7 +58,7 @@ cr.define('wallpapers', function() {
imageEl.addEventListener('load', function(e) {
window.URL.revokeObjectURL(this.src);
});
- } else {
+ } else if (self.dataItem.source == 'ONLINE') {
var xhr = new XMLHttpRequest();
xhr.open('GET', self.dataItem.baseURL + ThumbnailSuffix, true);
xhr.responseType = 'arraybuffer';

Powered by Google App Engine
This is Rietveld 408576698