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

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

Issue 11280300: Revert 171011 - Broke Linux ChromiumOS Tests (dbg)(2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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
===================================================================
--- chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js (revision 171042)
+++ chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js (working copy)
@@ -15,7 +15,6 @@
function WallpaperManager(dialogDom) {
this.dialogDom_ = dialogDom;
- this.storage_ = chrome.storage.local;
this.document_ = dialogDom.ownerDocument;
this.selectedCategory = null;
this.butterBar_ = new ButterBar(this.dialogDom_);
@@ -41,11 +40,6 @@
/** @const */ var HighResolutionSuffix = '_high_resolution.jpg';
/**
- * Key to access wallpaper manifest in chrome.local.storage.
- */
- /** @const */ var AccessManifestKey = 'wallpaper-picker-manifest-key';
-
- /**
* Returns a translated string.
*
* Wrapper function to make dealing with translated strings more concise.
@@ -125,16 +119,9 @@
}
};
- if (navigator.onLine) {
- asyncFetchManifestFromUrls(urls, fetchManifestAsync,
- this.onLoadManifestSuccess_.bind(this),
- this.onLoadManifestFailed_.bind(this));
- } else {
- // If device is offline, fetches manifest from local storage.
- // TODO(bshe): Always loading the offline manifest first and replacing
- // with the online one when available.
- this.onLoadManifestFailed_();
- }
+ asyncFetchManifestFromUrls(urls, fetchManifestAsync,
+ this.onLoadManifestSuccess_.bind(this),
+ this.onLoadManifestFailed_.bind(this));
};
/**
@@ -144,22 +131,18 @@
*/
WallpaperManager.prototype.onLoadManifestSuccess_ = function(manifest) {
this.manifest_ = manifest;
- var items = {};
- items[AccessManifestKey] = manifest;
- this.storage_.set(items, function() {});
this.initDom_();
};
- // Sets manifest to previously saved object if any and shows connection error.
- // Called after manifest failed to load.
+ // Sets manifest to an empty object and shows connection error. Called after
+ // manifest failed to load.
WallpaperManager.prototype.onLoadManifestFailed_ = function() {
- var self = this;
- this.storage_.get(AccessManifestKey, function(items) {
- self.manifest_ = items[AccessManifestKey] ? items[AccessManifestKey] : {};
- self.butterBar_.showError_(str('connectionFailed'),
- {help_url: LEARN_MORE_URL});
- self.initDom_();
- });
+ // TODO(bshe): Fall back to saved manifest if there is a problem fetching
+ // manifest from server.
+ this.manifest_ = {};
+ this.butterBar_.showError_(str('connectionFailed'),
+ {help_url: LEARN_MORE_URL});
+ this.initDom_();
};
/**

Powered by Google App Engine
This is Rietveld 408576698