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

Unified Diff: chrome/browser/supervised_user/chromeos/manager_password_service.h

Issue 1878143002: Convert //chrome/browser/supervised_user 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: chrome/browser/supervised_user/chromeos/manager_password_service.h
diff --git a/chrome/browser/supervised_user/chromeos/manager_password_service.h b/chrome/browser/supervised_user/chromeos/manager_password_service.h
index b2fc04a9989b4727eb972cadb6dcb3c9ab8d3ee7..76bf7d3f679a4679fb4234e46a38e91d23d503a1 100644
--- a/chrome/browser/supervised_user/chromeos/manager_password_service.h
+++ b/chrome/browser/supervised_user/chromeos/manager_password_service.h
@@ -5,11 +5,11 @@
#ifndef CHROME_BROWSER_SUPERVISED_USER_CHROMEOS_MANAGER_PASSWORD_SERVICE_H_
#define CHROME_BROWSER_SUPERVISED_USER_CHROMEOS_MANAGER_PASSWORD_SERVICE_H_
+#include <memory>
#include <string>
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.h"
#include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h"
@@ -50,11 +50,11 @@ class ManagerPasswordService
void GetSupervisedUsersCallback(
const std::string& sync_su_id,
const std::string& user_id,
- scoped_ptr<base::DictionaryValue> password_data,
+ std::unique_ptr<base::DictionaryValue> password_data,
const base::DictionaryValue* supervised_users);
void OnAddKeySuccess(const UserContext& master_key_context,
const std::string& user_id,
- scoped_ptr<base::DictionaryValue> password_data);
+ std::unique_ptr<base::DictionaryValue> password_data);
void OnKeyTransformedIfNeeded(const UserContext& master_key_context);
void OnNewManagerKeySuccess(const UserContext& master_key_context);
void OnOldSupervisedUserKeyDeleted(const UserContext& master_key_context);
@@ -66,8 +66,8 @@ class ManagerPasswordService
SupervisedUserSyncService* user_service_;
SupervisedUserSharedSettingsService* settings_service_;
- scoped_ptr<SupervisedUserSharedSettingsService::ChangeCallbackList::
- Subscription>
+ std::unique_ptr<
+ SupervisedUserSharedSettingsService::ChangeCallbackList::Subscription>
settings_service_subscription_;
scoped_refptr<ExtendedAuthenticator> authenticator_;

Powered by Google App Engine
This is Rietveld 408576698