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

Unified Diff: components/user_manager/user_manager_base.cc

Issue 1917673002: Convert //components/[u-z]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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: components/user_manager/user_manager_base.cc
diff --git a/components/user_manager/user_manager_base.cc b/components/user_manager/user_manager_base.cc
index 7f178809bcbad9be91c97dcdab6df29a0c418bc4..67215eec3753c2831a3eabb05eb2ab8a04f0c4d8 100644
--- a/components/user_manager/user_manager_base.cc
+++ b/components/user_manager/user_manager_base.cc
@@ -1018,7 +1018,7 @@ void UserManagerBase::SendGaiaUserLoginMetrics(const AccountId& account_id) {
void UserManagerBase::UpdateUserAccountLocale(const AccountId& account_id,
const std::string& locale) {
- scoped_ptr<std::string> resolved_locale(new std::string());
+ std::unique_ptr<std::string> resolved_locale(new std::string());
if (!locale.empty() && locale != GetApplicationLocale()) {
// base::Passed will nullptr out |resolved_locale|, so cache the underlying
// ptr.
@@ -1036,7 +1036,7 @@ void UserManagerBase::UpdateUserAccountLocale(const AccountId& account_id,
void UserManagerBase::DoUpdateAccountLocale(
const AccountId& account_id,
- scoped_ptr<std::string> resolved_locale) {
+ std::unique_ptr<std::string> resolved_locale) {
User* user = FindUserAndModify(account_id);
if (user && resolved_locale)
user->SetAccountLocale(*resolved_locale);
« no previous file with comments | « components/user_manager/user_manager_base.h ('k') | components/user_prefs/tracked/interceptable_pref_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698