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

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

Issue 10978022: Center wallpaper picker when open and open author's website in a new window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Only allow one instance of wallpaper picker. Created 8 years, 3 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_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 2cad3fc2dc47faeb178aac8bdcf03719964bd0ae..7c2040cddfc743df4adf768e2dea57cc142bf04e 100644
--- a/chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js
+++ b/chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js
@@ -175,38 +175,32 @@ function WallpaperManager(dialogDom) {
*/
WallpaperManager.prototype.onThumbnailClicked_ = function() {
var selectedItem = this.wallpaperGrid_.selectedItem;
- if (!selectedItem || !selectedItem.dynamicURL ||
- this.wallpaperGrid_.inProgramSelection)
- return;
-
- // TODO(bshe): Only download one high resolution wallpaper from server.
- // Resize the high resolution wallpaper to screen sized wallpaper for
- // devices with small screen.
- var wallpaperURL = selectedItem.baseURL + HighResolutionSuffix;
-
- if (this.wallpaperRequest_)
- this.wallpaperRequest_.abort();
- // TODO(bshe): XMLHttpRequest may be cancelled by window.close(). We should
- // either wait for response before closing window or use an extension
- // background page to get response afte window closed.
- this.wallpaperRequest_ = new XMLHttpRequest();
- this.wallpaperRequest_.open('GET', wallpaperURL, true);
- this.wallpaperRequest_.responseType = 'arraybuffer';
- this.wallpaperRequest_.send(null);
- this.butterBar_.setRequest(this.wallpaperRequest_);
- var self = this;
- this.wallpaperRequest_.addEventListener('load', function(e) {
- if (self.wallpaperRequest_.status === 200) {
- var image = self.wallpaperRequest_.response;
- chrome.wallpaperPrivate.setWallpaper(image,
- selectedItem.layout,
- wallpaperURL);
- self.currentWallpaper_ = wallpaperURL;
- } else {
- self.butterBar_.showError_(str('downloadFailed'));
- }
- self.wallpaperRequest_ = null;
- });
+ if (selectedItem && selectedItem.dynamicURL &&
+ !this.wallpaperGrid_.inProgramSelection) {
+ var wallpaperURL = selectedItem.baseURL + HighResolutionSuffix;
+
+ if (this.wallpaperRequest_)
+ this.wallpaperRequest_.abort();
+
+ this.wallpaperRequest_ = new XMLHttpRequest();
+ this.wallpaperRequest_.open('GET', wallpaperURL, true);
+ this.wallpaperRequest_.responseType = 'arraybuffer';
+ this.wallpaperRequest_.send(null);
+ this.butterBar_.setRequest(this.wallpaperRequest_);
+ var self = this;
+ this.wallpaperRequest_.addEventListener('load', function(e) {
+ if (self.wallpaperRequest_.status === 200) {
+ var image = self.wallpaperRequest_.response;
+ chrome.wallpaperPrivate.setWallpaper(image,
+ selectedItem.layout,
+ wallpaperURL);
+ self.currentWallpaper_ = wallpaperURL;
+ } else {
+ self.butterBar_.showError_(str('downloadFailed'));
+ }
+ self.wallpaperRequest_ = null;
+ });
+ }
this.setWallpaperAttribution_(selectedItem);
};

Powered by Google App Engine
This is Rietveld 408576698