| 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 e167e493e6cd78d2014042097de9961b972fce79..8ff414abe62c5effc5a120b86ccafe900209e34b 100644
|
| --- a/chrome/browser/chromeos/login/wallpaper_manager.h
|
| +++ b/chrome/browser/chromeos/login/wallpaper_manager.h
|
| @@ -7,7 +7,11 @@
|
|
|
| #include <string>
|
|
|
| +#include "ash/desktop_background/desktop_background_resources.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "base/timer.h"
|
| +#include "chrome/browser/chromeos/login/user_image.h"
|
| +#include "chrome/browser/chromeos/login/user_image_loader.h"
|
| #include "chrome/browser/chromeos/power/resume_observer.h"
|
| #include "chrome/browser/chromeos/system/timezone_settings.h"
|
| #include "unicode/timezone.h"
|
| @@ -34,6 +38,11 @@ class WallpaperManager: public system::TimezoneSettings::Observer,
|
| // Cancel any previous timer if any.
|
| void RestartTimer();
|
|
|
| + // Sets wallpaper to the image file |path| points to.
|
| + void SetWallpaperFromFile(std::string email,
|
| + const std::string& path,
|
| + ash::WallpaperLayout layout);
|
| +
|
| private:
|
| virtual ~WallpaperManager();
|
|
|
| @@ -43,11 +52,18 @@ class WallpaperManager: public system::TimezoneSettings::Observer,
|
| // Overridden from chromeos::ResumeObserver
|
| virtual void SystemResumed() OVERRIDE;
|
|
|
| + void OnCustomWallpaperLoaded(const std::string& email,
|
| + ash::WallpaperLayout layout,
|
| + const UserImage& user_image);
|
| +
|
| // Change the wallpapers for users who choose DAILY wallpaper type. Updates
|
| // current wallpaper if it changed. This function should be called at exactly
|
| // at 0am if chromeos device is on.
|
| void BatchUpdateWallpaper();
|
|
|
| + // Loads user image from its file.
|
| + scoped_refptr<UserImageLoader> image_loader_;
|
| +
|
| // The last selected user on user pod row.
|
| std::string last_selected_user_;
|
|
|
|
|