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

Unified Diff: chrome/browser/chromeos/login/wallpaper_manager.h

Issue 10890038: Hook up custom wallpaper code path to new wallpaper picker. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to trunk Created 8 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
Index: chrome/browser/chromeos/login/wallpaper_manager.h
diff --git a/chrome/browser/chromeos/login/wallpaper_manager.h b/chrome/browser/chromeos/login/wallpaper_manager.h
index 9e6049937f78151db2385028cfe13357d08a4e57..15d65e3fd3b08589bae0497fef11208578ffae4b 100644
--- a/chrome/browser/chromeos/login/wallpaper_manager.h
+++ b/chrome/browser/chromeos/login/wallpaper_manager.h
@@ -102,6 +102,14 @@ class WallpaperManager: public system::TimezoneSettings::Observer,
// Cancel any previous timer if any.
void RestartTimer();
+ // Saves custom wallpaper to file, post task to generate thumbnail and updates
+ // local state preferences.
+ void SetCustomWallpaper(const std::string& username,
+ ash::WallpaperLayout layout,
+ User::WallpaperType type,
+ base::WeakPtr<WallpaperDelegate> delegate,
+ const UserImage& wallpaper);
+
// Tries to load user image from disk; if successful, sets it for the user,
// and updates Local State.
void SetUserWallpaperFromFile(const std::string& username,
@@ -237,14 +245,6 @@ class WallpaperManager: public system::TimezoneSettings::Observer,
// Saves wallpaper image raw |data| to |path| (absolute path) in file system.
void SaveWallpaperInternal(const FilePath& path, const char* data, int size);
- // Saves custom wallpaper to file, post task to generate thumbnail and updates
- // local state preferences.
- void SetCustomWallpaper(const std::string& username,
- ash::WallpaperLayout layout,
- User::WallpaperType type,
- base::WeakPtr<WallpaperDelegate> delegate,
- const UserImage& wallpaper);
-
// Whether wallpaper data should be persisted for user |email|.
// Note: this function can not be called in SetUserWallpaperProperties. It
// will create a deadlock. (issue 142440)
« no previous file with comments | « chrome/browser/chromeos/extensions/wallpaper_private_api.cc ('k') | chrome/browser/chromeos/login/wallpaper_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698