Index: chrome/browser/ui/webui/settings/people_handler.cc |
diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc |
index 214a38c77ff28741547d29de635e719ae0f7b9fa..bb9bc5e2fe9ff0566aac3d1380d48cea638062e5 100644 |
--- a/chrome/browser/ui/webui/settings/people_handler.cc |
+++ b/chrome/browser/ui/webui/settings/people_handler.cc |
@@ -824,10 +824,12 @@ void PeopleHandler::PushSyncPrefs() { |
// UI even if no encrypted data types are enabled. |
args.SetBoolean("passphraseRequired", service->IsPassphraseRequired()); |
- // To distinguish between FROZEN_IMPLICIT_PASSPHRASE and CUSTOM_PASSPHRASE |
- // we only set passphraseTypeIsCustom for CUSTOM_PASSPHRASE. |
+ // To distinguish between PassphraseType::FROZEN_IMPLICIT_PASSPHRASE and |
+ // PassphraseType::CUSTOM_PASSPHRASE |
+ // we only set passphraseTypeIsCustom for PassphraseType::CUSTOM_PASSPHRASE. |
args.SetBoolean("passphraseTypeIsCustom", |
- service->GetPassphraseType() == syncer::CUSTOM_PASSPHRASE); |
+ service->GetPassphraseType() == |
+ syncer::PassphraseType::CUSTOM_PASSPHRASE); |
base::Time passphrase_time = service->GetExplicitPassphraseTime(); |
syncer::PassphraseType passphrase_type = service->GetPassphraseType(); |
if (!passphrase_time.is_null()) { |
@@ -841,13 +843,13 @@ void PeopleHandler::PushSyncPrefs() { |
GetStringFUTF16(IDS_SYNC_ENTER_GOOGLE_PASSPHRASE_BODY_WITH_DATE, |
passphrase_time_str)); |
switch (passphrase_type) { |
- case syncer::FROZEN_IMPLICIT_PASSPHRASE: |
+ case syncer::PassphraseType::FROZEN_IMPLICIT_PASSPHRASE: |
args.SetString( |
"fullEncryptionBody", |
GetStringFUTF16(IDS_SYNC_FULL_ENCRYPTION_BODY_GOOGLE_WITH_DATE, |
passphrase_time_str)); |
break; |
- case syncer::CUSTOM_PASSPHRASE: |
+ case syncer::PassphraseType::CUSTOM_PASSPHRASE: |
args.SetString( |
"fullEncryptionBody", |
GetStringFUTF16(IDS_SYNC_FULL_ENCRYPTION_BODY_CUSTOM_WITH_DATE, |
@@ -858,7 +860,7 @@ void PeopleHandler::PushSyncPrefs() { |
GetStringUTF16(IDS_SYNC_FULL_ENCRYPTION_BODY_CUSTOM)); |
break; |
} |
- } else if (passphrase_type == syncer::CUSTOM_PASSPHRASE) { |
+ } else if (passphrase_type == syncer::PassphraseType::CUSTOM_PASSPHRASE) { |
args.SetString("fullEncryptionBody", |
GetStringUTF16(IDS_SYNC_FULL_ENCRYPTION_BODY_CUSTOM)); |
} else { |