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

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

Issue 11366143: Fix the crash in DesktopBackgroundView::OnPaint (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 fd7bb8876f144876c8db62507975849df967bbab..57c8a8102352094214a7e48e055b64406d808091 100644
--- a/chrome/browser/chromeos/login/wallpaper_manager.h
+++ b/chrome/browser/chromeos/login/wallpaper_manager.h
@@ -206,7 +206,7 @@ class WallpaperManager: public system::TimezoneSettings::Observer,
// Generates a 128x80 thumbnail and caches it.
void CacheThumbnail(const std::string& email,
- const gfx::ImageSkia& wallpaper);
+ scoped_ptr<gfx::ImageSkia> wallpaper);
// Deletes a list of wallpaper files in |file_list|.
void DeleteWallpaperInList(const std::vector<FilePath>& file_list);
@@ -265,6 +265,15 @@ class WallpaperManager: public system::TimezoneSettings::Observer,
void OnWallpaperEncoded(const FilePath& path,
scoped_refptr<base::RefCountedBytes> data);
+ // Generates thumbnail of custom wallpaper on FILE thread. If |persistent| is
+ // true, saves original custom image and resized images to disk.
+ void ProcessCustomWallpaper(const std::string& email,
+ bool persistent,
+ const WallpaperInfo& info,
+ base::WeakPtr<WallpaperDelegate> delegate,
+ scoped_ptr<gfx::ImageSkia> image,
+ const UserImage::RawImage& raw_image);
+
// Record data for User Metrics Analysis.
void RecordUma(User::WallpaperType type, int index);

Powered by Google App Engine
This is Rietveld 408576698