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

Unified Diff: chrome/browser/chromeos/extensions/wallpaper_api.cc

Issue 559583002: change chrome.wallpaper.setWallpaper api (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « no previous file | chrome/common/extensions/api/wallpaper.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/extensions/wallpaper_api.cc
diff --git a/chrome/browser/chromeos/extensions/wallpaper_api.cc b/chrome/browser/chromeos/extensions/wallpaper_api.cc
index db55f5d4a69014395f563e463fdabfcfcb42b7c3..c8c637d96aa5f8ffb2bd5a85a6cc5e0d1ac7e29a 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_api.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_api.cc
@@ -104,8 +104,8 @@ bool WallpaperSetWallpaperFunction::RunAsync() {
user_id_hash_ =
user_manager::UserManager::Get()->GetLoggedInUser()->username_hash();
- if (params_->details.wallpaper_data) {
- StartDecode(*params_->details.wallpaper_data);
+ if (params_->details.data) {
+ StartDecode(*params_->details.data);
} else {
GURL wallpaper_url(*params_->details.url);
if (wallpaper_url.is_valid()) {
@@ -127,7 +127,7 @@ void WallpaperSetWallpaperFunction::OnWallpaperDecoded(
base::FilePath thumbnail_path = wallpaper_manager->GetCustomWallpaperPath(
chromeos::kThumbnailWallpaperSubDir,
user_id_hash_,
- params_->details.name);
+ params_->details.filename);
sequence_token_ = BrowserThread::GetBlockingPool()->
GetNamedSequenceToken(chromeos::kWallpaperSequenceTokenName);
@@ -141,7 +141,7 @@ void WallpaperSetWallpaperFunction::OnWallpaperDecoded(
user_id_ == user_manager::UserManager::Get()->GetActiveUser()->email();
wallpaper_manager->SetCustomWallpaper(user_id_,
user_id_hash_,
- params_->details.name,
+ params_->details.filename,
layout,
user_manager::User::CUSTOMIZED,
image,
@@ -209,8 +209,8 @@ void WallpaperSetWallpaperFunction::OnWallpaperFetched(
bool success,
const std::string& response) {
if (success) {
- params_->details.wallpaper_data.reset(new std::string(response));
- StartDecode(*params_->details.wallpaper_data);
+ params_->details.data.reset(new std::string(response));
+ StartDecode(*params_->details.data);
} else {
SetError(response);
SendResponse(false);
« no previous file with comments | « no previous file | chrome/common/extensions/api/wallpaper.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698