Skip to content

GitLab

T
tangled
Commit a4a179ce authored by rsleevi@chromium.org's avatar rsleevi@chromium.org
Browse files
Options

Revert 171011 - Broke Linux ChromiumOS Tests (dbg)(2) 

Make wallpaper picker manifest and thumbnails available when offline.

This CL did the following:

1. Save/update manifest in chrome.storage.local when user successfully
requested latest manifest from server. If user failed to get manifest
from server(offline or server error), fallback to the manifest saved
in chrome.storage.local last time.

2. Lazily saves all requested thumbnails to thumbnails directory. And
load from that directory when user open wallpaper picker next time. Note
that thumbnails are shared across user session. So after one user saved
thumbnails, all other users will directly use the thumbnails that saved
in thumbnail directory.


BUG=158668


Review URL: https://chromiumcodereview.appspot.com/11348215

TBR=bshe@chromium.org
Review URL: https://codereview.chromium.org/11280300

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171043 0039d316-1c4b-4281-b951-d872f2087c98
parent 76457ed1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 402 deletions
chrome/browser/chromeos/extensions/wallpaper_private_api.h
View file @ a4a179ce
......@@ -138,65 +138,4 @@ class WallpaperRestoreMinimizedWindowsFunction : public AsyncExtensionFunction {
virtual bool RunImpl() OVERRIDE;
};
class WallpaperGetThumbnailFunction : public AsyncExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION_NAME("wallpaperPrivate.getThumbnail");
WallpaperGetThumbnailFunction();
protected:
virtual ~WallpaperGetThumbnailFunction();
// AsyncExtensionFunction overrides.
virtual bool RunImpl() OVERRIDE;
private:
// Failed to get thumbnail for |file_name|.
void Failure(const std::string& file_name);
// Sets success field in the results to false. Called when the requested
// thumbnail is not found or corrupted in thumbnail directory.
void FileNotLoaded();
// Sets success field to true and data field to the loaded thumbnail binary
// data in the results. Called when requested wallpaper thumbnail loaded
// successfully.
void FileLoaded(const std::string& data);
// Gets thumbnail with |file_name| from thumbnail directory. If |file_name|
// does not exist, call FileNotLoaded().
void Get(const std::string& file_name);
// Sequence token associated with wallpaper operations. Shared with
// WallpaperManager.
base::SequencedWorkerPool::SequenceToken sequence_token_;
};
class WallpaperSaveThumbnailFunction : public AsyncExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION_NAME("wallpaperPrivate.saveThumbnail");
WallpaperSaveThumbnailFunction();
protected:
virtual ~WallpaperSaveThumbnailFunction();
// AsyncExtensionFunction overrides.
virtual bool RunImpl() OVERRIDE;
private:
// Failed to save thumbnail for |file_name|.
void Failure(const std::string& file_name);
// Saved thumbnail to thumbnail directory.
void Success();
// Saves thumbnail to thumbnail directory as |file_name|.
void Save(const std::string& data, const std::string& file_name);
// Sequence token associated with wallpaper operations. Shared with
// WallpaperManager.
base::SequencedWorkerPool::SequenceToken sequence_token_;
};
#endif // CHROME_BROWSER_CHROMEOS_EXTENSIONS_WALLPAPER_PRIVATE_API_H_
chrome/browser/extensions/extension_function_registry.cc
View file @ a4a179ce
......@@ -407,8 +407,6 @@ void ExtensionFunctionRegistry::ResetFunctions() {
RegisterFunction<WallpaperSetCustomWallpaperFunction>();
RegisterFunction<WallpaperMinimizeInactiveWindowsFunction>();
RegisterFunction<WallpaperRestoreMinimizedWindowsFunction>();
RegisterFunction<WallpaperGetThumbnailFunction>();
RegisterFunction<WallpaperSaveThumbnailFunction>();
// InputMethod
RegisterFunction<extensions::GetInputMethodFunction>();
......
chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_images_grid.js
View file @ a4a179ce
......@@ -32,36 +32,19 @@ cr.define('wallpapers', function() {
decorate: function() {
GridItem.prototype.decorate.call(this);
var imageEl = cr.doc.createElement('img');
var xhr = new XMLHttpRequest();
xhr.open('GET', this.dataItem.baseURL + ThumbnailSuffix, true);
xhr.responseType = 'blob';
xhr.send(null);
var self = this;
chrome.wallpaperPrivate.getThumbnail(this.dataItem.baseURL,
function(data) {
if (data) {
var blob = new Blob([new Int8Array(data)]);
imageEl.src = window.URL.createObjectURL(blob);
xhr.addEventListener('load', function(e) {
if (xhr.status === 200) {
self.textContent = '';
imageEl.src = window.URL.createObjectURL(xhr.response);
imageEl.addEventListener('load', function(e) {
window.URL.revokeObjectURL(this.src);
});
self.appendChild(imageEl);
} else {
var xhr = new XMLHttpRequest();
xhr.open('GET', self.dataItem.baseURL + ThumbnailSuffix, true);
xhr.responseType = 'arraybuffer';
xhr.send(null);
xhr.addEventListener('load', function(e) {
if (xhr.status === 200) {
self.textContent = '';
chrome.wallpaperPrivate.saveThumbnail(self.dataItem.baseURL,
xhr.response);
var blob = new Blob([new Int8Array(xhr.response)]);
imageEl.src = window.URL.createObjectURL(blob);
// TODO(bshe): We currently use empty div to reserve space for
// thumbnail. Use a placeholder like "loading" image may better.
imageEl.addEventListener('load', function(e) {
window.URL.revokeObjectURL(this.src);
});
self.appendChild(imageEl);
}
});
}
});
},
......
chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js
View file @ a4a179ce
......@@ -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_);
......@@ -40,11 +39,6 @@ function WallpaperManager(dialogDom) {
*/
/** @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.
*
......@@ -125,16 +119,9 @@ function WallpaperManager(dialogDom) {
}
};
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 @@ function WallpaperManager(dialogDom) {
*/
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_();
};
/**
......
chrome/browser/resources/chromeos/wallpaper_manager/manifest.json
View file @ a4a179ce
......@@ -8,7 +8,6 @@
"manifest_version": 2,
"description": "An experimental wallpaper picker UI",
"permissions": [
"storage",
"wallpaperPrivate",
"https://commondatastorage.googleapis.com/",
"https://storage.googleapis.com/"
......
chrome/common/chrome_paths.cc
View file @ a4a179ce
......@@ -367,11 +367,6 @@ bool PathProvider(int key, FilePath* result) {
return false;
cur = cur.Append(FILE_PATH_LITERAL("wallpapers"));
break;
case chrome::DIR_CHROMEOS_WALLPAPER_THUMBNAILS:
if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
return false;
cur = cur.Append(FILE_PATH_LITERAL("wallpaper_thumbnails"));
break;
case chrome::FILE_DEFAULT_APP_ORDER:
cur = FilePath(FILE_PATH_LITERAL(kDefaultAppOrderFileName));
break;
......
chrome/common/chrome_paths.h
View file @ a4a179ce
......@@ -101,8 +101,6 @@ enum {
#if defined(OS_CHROMEOS)
DIR_CHROMEOS_WALLPAPERS, // Directory where downloaded chromeos
// wallpapers reside.
DIR_CHROMEOS_WALLPAPER_THUMBNAILS, // Directory where downloaded chromeos
// wallpaper thumbnails reside.
FILE_DEFAULT_APP_ORDER, // Full path to the json file that defines the
// default app order.
#endif
......
chrome/common/extensions/api/wallpaper_private.json
View file @ a4a179ce
......@@ -87,57 +87,6 @@
"description": "Restores all previously minimized windows.",
"nodoc": "true",
"parameters": []
},
{
"name": "getThumbnail",
"type": "function",
"description": "Gets thumbnail of wallpaper from thumbnail directory.",
"nodoc": "true",
"parameters": [
{
"type": "string",
"name": "url",
"description": "Wallpaper url."
},
{
"type": "function",
"name": "callback",
"description": "Function called upon completion.",
"parameters": [
{
"type": "binary",
"name": "data",
"optional": true,
"description": "The binary data of loaded thumbnail."
}
]
}
]
},
{
"name": "saveThumbnail",
"type": "function",
"description": "Saves thumbnail to thumbnail directory.",
"nodoc": "true",
"parameters": [
{
"type": "string",
"name": "url",
"description": "Wallpaper url."
},
{
"type": "binary",
"name": "data",
"description": "The binary data of downloaded thumbnail."
},
{
"type": "function",
"name": "callback",
"description": "Function called upon completion.",
"parameters": [],
"optional": true
}
]
}
]
}
......
chrome/test/data/extensions/api_test/wallpaper_manager/test.js
View file @ a4a179ce
......@@ -11,20 +11,6 @@ var fail = chrome.test.callbackFail;
chrome.test.getConfig(function(config) {
var wallpaper;
var wallpaperStrings;
var requestImage = function(url, onLoadCallback) {
var wallpaperRequest = new XMLHttpRequest();
wallpaperRequest.open('GET', url, true);
wallpaperRequest.responseType = 'arraybuffer';
try {
wallpaperRequest.send(null);
wallpaperRequest.onloadend = function(e) {
onLoadCallback(wallpaperRequest.status, wallpaperRequest.response);
};
} catch (e) {
console.error(e);
chrome.test.fail('An error thrown when requesting wallpaper.');
};
};
chrome.test.runTests([
function getWallpaperStrings() {
chrome.wallpaperPrivate.getStrings(pass(function(strings) {
......@@ -32,20 +18,29 @@ chrome.test.getConfig(function(config) {
}));
},
function setOnlineJpegWallpaper() {
var wallpaperRequest = new XMLHttpRequest();
var url = "http://a.com:PORT/files/extensions/api_test" +
"/wallpaper_manager/test.jpg";
url = url.replace(/PORT/, config.testServer.port);
requestImage(url, function(requestStatus, response) {
if (requestStatus === 200) {
wallpaper = response;
chrome.wallpaperPrivate.setWallpaper(wallpaper,
'CENTER_CROPPED',
url,
pass());
} else {
chrome.test.fail('Failed to load test.jpg from local server.');
}
});
wallpaperRequest.open('GET', url, true);
wallpaperRequest.responseType = 'arraybuffer';
try {
wallpaperRequest.send(null);
wallpaperRequest.onload = function (e) {
if (wallpaperRequest.status === 200) {
wallpaper = wallpaperRequest.response;
chrome.wallpaperPrivate.setWallpaper(wallpaper,
'CENTER_CROPPED',
url,
pass());
} else {
chrome.test.fail('Failed to load test.jpg from local server.');
}
};
} catch (e) {
console.error(e);
chrome.test.fail('An error thrown when requesting wallpaper.');
};
},
function setCustomJpegWallpaper() {
chrome.wallpaperPrivate.setCustomWallpaper(wallpaper,
......@@ -53,37 +48,27 @@ chrome.test.getConfig(function(config) {
pass());
},
function setCustomJepgBadWallpaper() {
var wallpaperRequest = new XMLHttpRequest();
var url = "http://a.com:PORT/files/extensions/api_test" +
"/wallpaper_manager/test_bad.jpg";
url = url.replace(/PORT/, config.testServer.port);
requestImage(url, function(requestStatus, response) {
if (requestStatus === 200) {
var badWallpaper = response;
chrome.wallpaperPrivate.setCustomWallpaper(badWallpaper,
'CENTER_CROPPED', fail(wallpaperStrings.invalidWallpaper));
} else {
chrome.test.fail('Failed to load test_bad.jpg from local server.');
}
});
},
function getAndSetThumbnail() {
var url = "http://a.com:PORT/files/extensions/api_test" +
"/wallpaper_manager/test.jpg";
url = url.replace(/PORT/, config.testServer.port);
chrome.wallpaperPrivate.getThumbnail(url, pass(function(data) {
chrome.test.assertNoLastError();
if (data)
chrome.test.fail('Thumbnail is not found. getThumbnail should not ' +
'return any data.');
chrome.wallpaperPrivate.saveThumbnail(url, wallpaper, pass(function() {
chrome.test.assertNoLastError();
chrome.wallpaperPrivate.getThumbnail(url, pass(function(data) {
chrome.test.assertNoLastError();
// Thumbnail should already be saved to thumbnail directory.
chrome.test.assertEq(wallpaper, data);
}));
}));
}));
wallpaperRequest.open('GET', url, true);
wallpaperRequest.responseType = 'arraybuffer';
try {
wallpaperRequest.send(null);
wallpaperRequest.onload = function (e) {
if (wallpaperRequest.status === 200) {
var badWallpaper = wallpaperRequest.response;
chrome.wallpaperPrivate.setCustomWallpaper(badWallpaper,
'CENTER_CROPPED', fail(wallpaperStrings.invalidWallpaper));
} else {
chrome.test.fail('Failed to load test_bad.jpg from local server.');
}
};
} catch (e) {
console.error(e);
chrome.test.fail('An error thrown when requesting wallpaper.');
};
}
]);
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment