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

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

Issue 1794323003: Make user_manager::UserImage non-copyable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: just rebase Created 4 years, 8 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/users/wallpaper/wallpaper_manager.h
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h
index 69e94de22d1d3d5e7402a88a82b0eec210263482..8940f0deefd4475d80293ddadb0454bd28e2dc68 100644
--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h
+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h
@@ -153,8 +153,9 @@ class WallpaperManager
// Set wallpaper to |user_image| controlled by policy. (Takes a UserImage
// because that's the callback interface provided by UserImageLoader.)
- void SetPolicyControlledWallpaper(const AccountId& account_id,
- const user_manager::UserImage& user_image);
+ void SetPolicyControlledWallpaper(
+ const AccountId& account_id,
+ scoped_ptr<user_manager::UserImage> user_image);
// Calls SetCustomWallpaper() with |wallpaper_files_id_str| received from
// cryptohome.
@@ -169,11 +170,12 @@ class WallpaperManager
void InitializeRegisteredDeviceWallpaper() override;
bool GetUserWallpaperInfo(const AccountId& account_id,
wallpaper::WallpaperInfo* info) const override;
- void OnWallpaperDecoded(const AccountId& account_id,
- wallpaper::WallpaperLayout layout,
- bool update_wallpaper,
- wallpaper::MovableOnDestroyCallbackHolder on_finish,
- const user_manager::UserImage& user_image) override;
+ void OnWallpaperDecoded(
+ const AccountId& account_id,
+ wallpaper::WallpaperLayout layout,
+ bool update_wallpaper,
+ wallpaper::MovableOnDestroyCallbackHolder on_finish,
+ scoped_ptr<user_manager::UserImage> user_image) override;
void StartLoad(const AccountId& account_id,
const wallpaper::WallpaperInfo& info,
bool update_wallpaper,
@@ -196,7 +198,7 @@ class WallpaperManager
const wallpaper::WallpaperLayout layout,
scoped_ptr<user_manager::UserImage>* result,
wallpaper::MovableOnDestroyCallbackHolder on_finish,
- const user_manager::UserImage& user_image) override;
+ scoped_ptr<user_manager::UserImage> user_image) override;
void StartLoadAndSetDefaultWallpaper(
const base::FilePath& path,
const wallpaper::WallpaperLayout layout,

Powered by Google App Engine
This is Rietveld 408576698