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

Unified Diff: chrome/browser/supervised_user/legacy/supervised_user_shared_settings_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/legacy/supervised_user_shared_settings_service.h
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.h b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.h
index aeaabf3d5393100f66bb067869a3006dd9e8329b..868d0f4e365081e8be75e858a483b879019ec0b5 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.h
+++ b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.h
@@ -5,11 +5,11 @@
#ifndef CHROME_BROWSER_SUPERVISED_USER_LEGACY_SUPERVISED_USER_SHARED_SETTINGS_SERVICE_H_
#define CHROME_BROWSER_SUPERVISED_USER_LEGACY_SUPERVISED_USER_SHARED_SETTINGS_SERVICE_H_
+#include <memory>
#include <string>
#include "base/callback.h"
#include "base/callback_list.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/supervised_user/supervised_users.h"
#include "components/keyed_service/core/keyed_service.h"
#include "sync/api/syncable_service.h"
@@ -71,7 +71,7 @@ class SupervisedUserSharedSettingsService : public KeyedService,
// whenever any setting for any supervised user is changed via Sync (but not
// for local changes). Subscribers should filter the settings and users they
// are interested in with the |su_id| and |key| parameters to the callback.
- scoped_ptr<ChangeCallbackList::Subscription> Subscribe(
+ std::unique_ptr<ChangeCallbackList::Subscription> Subscribe(
const ChangeCallback& cb);
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
@@ -95,8 +95,8 @@ class SupervisedUserSharedSettingsService : public KeyedService,
syncer::SyncMergeResult MergeDataAndStartSyncing(
syncer::ModelType type,
const syncer::SyncDataList& initial_sync_data,
- scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
- scoped_ptr<syncer::SyncErrorFactory> error_handler) override;
+ std::unique_ptr<syncer::SyncChangeProcessor> sync_processor,
+ std::unique_ptr<syncer::SyncErrorFactory> error_handler) override;
void StopSyncing(syncer::ModelType type) override;
syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
syncer::SyncError ProcessSyncChanges(
@@ -104,8 +104,8 @@ class SupervisedUserSharedSettingsService : public KeyedService,
const syncer::SyncChangeList& change_list) override;
private:
- scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
- scoped_ptr<syncer::SyncErrorFactory> error_handler_;
+ std::unique_ptr<syncer::SyncChangeProcessor> sync_processor_;
+ std::unique_ptr<syncer::SyncErrorFactory> error_handler_;
ChangeCallbackList callbacks_;

Powered by Google App Engine
This is Rietveld 408576698