Chromium Code Reviews| 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 be090ff18d4d8c9a55d477dd671deab3cad8a174..4f38bb311f834fdd228703447998bfd998cb3f64 100644 |
| --- a/chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js |
| +++ b/chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js |
| @@ -507,13 +507,15 @@ function WallpaperManager(dialogDom) { |
| var onSuccess = function(xhr) { |
| var image = xhr.response; |
| - chrome.wallpaperPrivate.setWallpaper(image, selectedItem.layout, |
| - wallpaperURL, |
| - self.onFinished_.bind(self, selectedGridItem, selectedItem)); |
| - self.currentWallpaper_ = wallpaperURL; |
| - WallpaperUtil.saveWallpaperInfo(wallpaperURL, selectedItem.layout, |
| - selectedItem.source); |
| - self.wallpaperRequest_ = null; |
| + if (image) { |
|
flackr
2013/09/06 15:44:00
onSuccess can actually be called if there's no res
|
| + chrome.wallpaperPrivate.setWallpaper(image, selectedItem.layout, |
| + wallpaperURL, |
| + self.onFinished_.bind(self, selectedGridItem, selectedItem)); |
| + self.currentWallpaper_ = wallpaperURL; |
| + WallpaperUtil.saveWallpaperInfo(wallpaperURL, selectedItem.layout, |
| + selectedItem.source); |
| + self.wallpaperRequest_ = null; |
| + } |
| }; |
| var onFailure = function() { |
| self.progressManager_.hideProgressBar(selectedGridItem); |