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

Unified Diff: chrome/browser/supervised_user/supervised_user_settings_service.cc

Issue 615493005: c/b/supervised_user: Use range-based for where appropriate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix CrOS Created 6 years, 3 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/supervised_user_settings_service.cc
diff --git a/chrome/browser/supervised_user/supervised_user_settings_service.cc b/chrome/browser/supervised_user/supervised_user_settings_service.cc
index ccc3112af2196c5afc236d98f0b5c0aa5602a645..ef3207b1ee0fc70d72be65b55e2096f63bfc2dc3 100644
--- a/chrome/browser/supervised_user/supervised_user_settings_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_settings_service.cc
@@ -173,11 +173,10 @@ SyncMergeResult SupervisedUserSettingsService::MergeDataAndStartSyncing(
// Clear all atomic and split settings, then recreate them from Sync data.
Clear();
- for (SyncDataList::const_iterator it = initial_sync_data.begin();
- it != initial_sync_data.end(); ++it) {
- DCHECK_EQ(SUPERVISED_USER_SETTINGS, it->GetDataType());
+ for (const SyncData& sync_data : initial_sync_data) {
+ DCHECK_EQ(SUPERVISED_USER_SETTINGS, sync_data.GetDataType());
const ::sync_pb::ManagedUserSettingSpecifics& supervised_user_setting =
- it->GetSpecifics().managed_user_setting();
+ sync_data.GetSpecifics().managed_user_setting();
scoped_ptr<base::Value> value(
JSONReader::Read(supervised_user_setting.value()));
std::string name_suffix = supervised_user_setting.name();
@@ -248,24 +247,24 @@ SyncDataList SupervisedUserSettingsService::GetAllSyncData(
SyncError SupervisedUserSettingsService::ProcessSyncChanges(
const tracked_objects::Location& from_here,
const SyncChangeList& change_list) {
- for (SyncChangeList::const_iterator it = change_list.begin();
- it != change_list.end(); ++it) {
- SyncData data = it->sync_data();
+ for (const SyncChange& sync_change : change_list) {
+ SyncData data = sync_change.sync_data();
DCHECK_EQ(SUPERVISED_USER_SETTINGS, data.GetDataType());
const ::sync_pb::ManagedUserSettingSpecifics& supervised_user_setting =
data.GetSpecifics().managed_user_setting();
std::string key = supervised_user_setting.name();
base::DictionaryValue* dict = GetDictionaryAndSplitKey(&key);
- switch (it->change_type()) {
+ SyncChange::SyncChangeType change_type = sync_change.change_type();
+ switch (change_type) {
case SyncChange::ACTION_ADD:
case SyncChange::ACTION_UPDATE: {
scoped_ptr<base::Value> value(
JSONReader::Read(supervised_user_setting.value()));
if (dict->HasKey(key)) {
- DLOG_IF(WARNING, it->change_type() == SyncChange::ACTION_ADD)
+ DLOG_IF(WARNING, change_type == SyncChange::ACTION_ADD)
<< "Value for key " << key << " already exists";
} else {
- DLOG_IF(WARNING, it->change_type() == SyncChange::ACTION_UPDATE)
+ DLOG_IF(WARNING, change_type == SyncChange::ACTION_UPDATE)
<< "Value for key " << key << " doesn't exist yet";
}
dict->SetWithoutPathExpansion(key, value.release());
@@ -379,8 +378,6 @@ void SupervisedUserSettingsService::InformSubscribers() {
return;
scoped_ptr<base::DictionaryValue> settings = GetSettings();
- for (std::vector<SettingsCallback>::iterator it = subscribers_.begin();
- it != subscribers_.end(); ++it) {
- it->Run(settings.get());
- }
+ for (const auto& callback : subscribers_)
+ callback.Run(settings.get());
}

Powered by Google App Engine
This is Rietveld 408576698