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

Unified Diff: components/user_prefs/tracked/tracked_split_preference.cc

Issue 2384213002: Send a TrackedPreference incident when registry pref validation fails. (Closed)
Patch Set: Address comments on patch set 4 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 side-by-side diff with in-line comments
Download patch
Index: components/user_prefs/tracked/tracked_split_preference.cc
diff --git a/components/user_prefs/tracked/tracked_split_preference.cc b/components/user_prefs/tracked/tracked_split_preference.cc
index 979f90b2388202740da64264b73c400bf01560ff..2094d97b71ec6b8ee4dea42dd030ffdedf9ec44a 100644
--- a/components/user_prefs/tracked/tracked_split_preference.cc
+++ b/components/user_prefs/tracked/tracked_split_preference.cc
@@ -64,22 +64,21 @@ bool TrackedSplitPreference::EnforceAndReport(
helper_.ReportValidationResult(value_state, transaction->GetStoreUMASuffix());
PrefHashStoreTransaction::ValueState external_validation_value_state =
- PrefHashStoreTransaction::UNCHANGED;
+ PrefHashStoreTransaction::UNSUPPORTED;
+ std::vector<std::string> external_validation_invalid_keys;
if (external_validation_transaction) {
- std::vector<std::string> invalid_external_validation_keys;
external_validation_value_state =
external_validation_transaction->CheckSplitValue(
- pref_path_, dict_value, &invalid_external_validation_keys);
+ pref_path_, dict_value, &external_validation_invalid_keys);
helper_.ReportValidationResult(
external_validation_value_state,
external_validation_transaction->GetStoreUMASuffix());
-
- // TODO(proberge): Call delegate_->OnSplitPreferenceValidation.
}
if (delegate_) {
- delegate_->OnSplitPreferenceValidation(pref_path_, dict_value, invalid_keys,
- value_state, helper_.IsPersonal());
+ delegate_->OnSplitPreferenceValidation(
+ pref_path_, dict_value, invalid_keys, external_validation_invalid_keys,
+ value_state, external_validation_value_state, helper_.IsPersonal());
}
TrackedPreferenceHelper::ResetAction reset_action =
helper_.GetAction(value_state);

Powered by Google App Engine
This is Rietveld 408576698