chrome/browser/chromeos/login/users/avatar/user_image_loader.h - Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/users/avatar/user_image_loader.h

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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/avatar/mock_user_image_manager.h ('k') | chrome/browser/chromeos/login/users/avatar/user_image_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/avatar/user_image_loader.h

diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_loader.h b/chrome/browser/chromeos/login/users/avatar/user_image_loader.h

index 408a7e8d2b01de0d946852a7e395ec6b2058e127..dc36329cb24ddecd5c992e662bb1403be87116d9 100644

--- a/chrome/browser/chromeos/login/users/avatar/user_image_loader.h

+++ b/chrome/browser/chromeos/login/users/avatar/user_image_loader.h

@@ -25,7 +25,7 @@ class UserImage;

namespace chromeos {

namespace user_image_loader {

-typedef base::Callback<void(scoped_ptr<user_manager::UserImage>)>

+typedef base::Callback<void(std::unique_ptr<user_manager::UserImage>)>

LoadedCallback;

// Loads an image with |image_codec| in the background and calls |loaded_cb|

@@ -44,7 +44,7 @@ void StartWithFilePath(

const LoadedCallback& loaded_cb);

void StartWithData(

scoped_refptr<base::SequencedTaskRunner> background_task_runner,

- scoped_ptr<std::string> data,

+ std::unique_ptr<std::string> data,

ImageDecoder::ImageCodec image_codec,

int pixels_per_side,

const LoadedCallback& loaded_cb);