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

Unified Diff: chrome/browser/ui/webui/chromeos/image_source.cc

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
« no previous file with comments | « chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc ('k') | components/user_manager/user.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/image_source.cc
diff --git a/chrome/browser/ui/webui/chromeos/image_source.cc b/chrome/browser/ui/webui/chromeos/image_source.cc
index 3fb2775c7d483f887b540c11e9fb8be33619246a..502c11f296721e78dc48c139fb1c16ecad1939c6 100644
--- a/chrome/browser/ui/webui/chromeos/image_source.cc
+++ b/chrome/browser/ui/webui/chromeos/image_source.cc
@@ -35,11 +35,12 @@ const char* kWhitelistedDirectories[] = {
// Callback for user_manager::UserImageLoader.
void ImageLoaded(
const content::URLDataSource::GotDataCallback& got_data_callback,
- const user_manager::UserImage& user_image) {
+ scoped_ptr<user_manager::UserImage> user_image) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- if (user_image.has_image_bytes())
- got_data_callback.Run(new base::RefCountedBytes(user_image.image_bytes()));
+ // TODO(crbug.com/593251): Remove the data copy.
+ if (user_image->has_image_bytes())
+ got_data_callback.Run(new base::RefCountedBytes(user_image->image_bytes()));
else
got_data_callback.Run(NULL);
}
« no previous file with comments | « chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc ('k') | components/user_manager/user.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698