chrome/browser/chromeos/login/users/multi_profile_user_controller.cc - 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/multi_profile_user_controller.cc

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

Index: chrome/browser/chromeos/login/users/multi_profile_user_controller.cc

diff --git a/chrome/browser/chromeos/login/users/multi_profile_user_controller.cc b/chrome/browser/chromeos/login/users/multi_profile_user_controller.cc

index 2f7eab8ab479091809a50eef1e71eddb0ea964cb..07161d00ecf2aaea1393d16e6f69bf80a3b08163 100644

--- a/chrome/browser/chromeos/login/users/multi_profile_user_controller.cc

+++ b/chrome/browser/chromeos/login/users/multi_profile_user_controller.cc

@@ -4,8 +4,9 @@

#include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"

+#include <memory>

#include "base/bind.h"

-#include "base/memory/scoped_ptr.h"

#include "chrome/browser/chromeos/login/users/multi_profile_user_controller_delegate.h"

#include "chrome/browser/chromeos/policy/policy_cert_service.h"

#include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"

@@ -161,7 +162,7 @@ void MultiProfileUserController::StartObserving(Profile* user_profile) {

if (user_profile->GetProfileUserName().empty())

return;

- scoped_ptr<PrefChangeRegistrar> registrar(new PrefChangeRegistrar);

+ std::unique_ptr<PrefChangeRegistrar> registrar(new PrefChangeRegistrar);

registrar->Init(user_profile->GetPrefs());

registrar->Add(

prefs::kMultiProfileUserBehavior,