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

Side by Side Diff: components/proximity_auth/cryptauth/cryptauth_enrollment_manager.cc

Issue 2423353002: Reduce usage of FOR_EACH_OBSERVER macro in components/ (Closed)
Patch Set: Created 4 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/proximity_auth/cryptauth/cryptauth_enrollment_manager.h" 5 #include "components/proximity_auth/cryptauth/cryptauth_enrollment_manager.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/base64url.h" 9 #include "base/base64url.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 pref_service_->SetInteger(prefs::kCryptAuthEnrollmentReason, 148 pref_service_->SetInteger(prefs::kCryptAuthEnrollmentReason,
149 cryptauth::INVOCATION_REASON_UNKNOWN); 149 cryptauth::INVOCATION_REASON_UNKNOWN);
150 } 150 }
151 151
152 pref_service_->SetBoolean(prefs::kCryptAuthEnrollmentIsRecoveringFromFailure, 152 pref_service_->SetBoolean(prefs::kCryptAuthEnrollmentIsRecoveringFromFailure,
153 !success); 153 !success);
154 154
155 sync_request_->OnDidComplete(success); 155 sync_request_->OnDidComplete(success);
156 cryptauth_enroller_.reset(); 156 cryptauth_enroller_.reset();
157 sync_request_.reset(); 157 sync_request_.reset();
158 FOR_EACH_OBSERVER(Observer, observers_, OnEnrollmentFinished(success)); 158 for (auto& observer : observers_)
159 observer.OnEnrollmentFinished(success);
159 } 160 }
160 161
161 std::unique_ptr<SyncScheduler> 162 std::unique_ptr<SyncScheduler>
162 CryptAuthEnrollmentManager::CreateSyncScheduler() { 163 CryptAuthEnrollmentManager::CreateSyncScheduler() {
163 return base::MakeUnique<SyncSchedulerImpl>( 164 return base::MakeUnique<SyncSchedulerImpl>(
164 this, base::TimeDelta::FromDays(kEnrollmentRefreshPeriodDays), 165 this, base::TimeDelta::FromDays(kEnrollmentRefreshPeriodDays),
165 base::TimeDelta::FromMinutes(kEnrollmentBaseRecoveryPeriodMinutes), 166 base::TimeDelta::FromMinutes(kEnrollmentBaseRecoveryPeriodMinutes),
166 kEnrollmentMaxJitterRatio, "CryptAuth Enrollment"); 167 kEnrollmentMaxJitterRatio, "CryptAuth Enrollment");
167 } 168 }
168 169
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 OnEnrollmentFinished(false); 224 OnEnrollmentFinished(false);
224 } 225 }
225 } 226 }
226 227
227 void CryptAuthEnrollmentManager::OnReenrollMessage() { 228 void CryptAuthEnrollmentManager::OnReenrollMessage() {
228 ForceEnrollmentNow(cryptauth::INVOCATION_REASON_SERVER_INITIATED); 229 ForceEnrollmentNow(cryptauth::INVOCATION_REASON_SERVER_INITIATED);
229 } 230 }
230 231
231 void CryptAuthEnrollmentManager::OnSyncRequested( 232 void CryptAuthEnrollmentManager::OnSyncRequested(
232 std::unique_ptr<SyncScheduler::SyncRequest> sync_request) { 233 std::unique_ptr<SyncScheduler::SyncRequest> sync_request) {
233 FOR_EACH_OBSERVER(Observer, observers_, OnEnrollmentStarted()); 234 for (auto& observer : observers_)
235 observer.OnEnrollmentStarted();
234 236
235 sync_request_ = std::move(sync_request); 237 sync_request_ = std::move(sync_request);
236 if (gcm_manager_->GetRegistrationId().empty() || 238 if (gcm_manager_->GetRegistrationId().empty() ||
237 pref_service_->GetInteger(prefs::kCryptAuthEnrollmentReason) == 239 pref_service_->GetInteger(prefs::kCryptAuthEnrollmentReason) ==
238 cryptauth::INVOCATION_REASON_MANUAL) { 240 cryptauth::INVOCATION_REASON_MANUAL) {
239 gcm_manager_->RegisterWithGCM(); 241 gcm_manager_->RegisterWithGCM();
240 } else { 242 } else {
241 DoCryptAuthEnrollment(); 243 DoCryptAuthEnrollment();
242 } 244 }
243 } 245 }
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 << device_info.gcm_registration_id(); 295 << device_info.gcm_registration_id();
294 296
295 cryptauth_enroller_ = enroller_factory_->CreateInstance(); 297 cryptauth_enroller_ = enroller_factory_->CreateInstance();
296 cryptauth_enroller_->Enroll( 298 cryptauth_enroller_->Enroll(
297 GetUserPublicKey(), GetUserPrivateKey(), device_info, invocation_reason, 299 GetUserPublicKey(), GetUserPrivateKey(), device_info, invocation_reason,
298 base::Bind(&CryptAuthEnrollmentManager::OnEnrollmentFinished, 300 base::Bind(&CryptAuthEnrollmentManager::OnEnrollmentFinished,
299 weak_ptr_factory_.GetWeakPtr())); 301 weak_ptr_factory_.GetWeakPtr()));
300 } 302 }
301 303
302 } // namespace proximity_auth 304 } // namespace proximity_auth
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698