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

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

Issue 10815047: Save user selected wallpaper information to local state. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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/browser/chromeos/login/wallpaper_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/extensions/wallpaper_private_api.cc
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
index 9ea531799257d3570edc6d40c627f4e176f87fca..9e9444f8bb40248fe8bf728455f645f522dd3a30 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
@@ -4,8 +4,6 @@
#include "chrome/browser/chromeos/extensions/wallpaper_private_api.h"
-#include "ash/desktop_background/desktop_background_controller.h"
-#include "ash/shell.h"
#include "base/file_util.h"
#include "base/json/json_writer.h"
#include "base/memory/scoped_ptr.h"
@@ -176,8 +174,11 @@ void WallpaperSetWallpaperFunction::SaveToFile() {
}
void WallpaperSetWallpaperFunction::SetDecodedWallpaper() {
- ash::Shell::GetInstance()->desktop_background_controller()->
- SetCustomWallpaper(wallpaper_, layout_);
+ chromeos::WallpaperManager* wallpaper_manager =
+ chromeos::WallpaperManager::Get();
+ wallpaper_manager->SetWallpaperFromImageSkia(wallpaper_, layout_);
+ wallpaper_manager->SaveUserWallpaperInfo(email_, file_name_, layout_,
+ chromeos::User::DEFAULT);
wallpaper_decoder_ = NULL;
SendResponse(true);
}
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/wallpaper_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698