diff options
author | maxbogue <maxbogue@chromium.org> | 2015-09-10 10:40:19 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-09-10 17:41:08 +0000 |
commit | 81abdf24465d84e2304b8245d2f51400436ce2e8 (patch) | |
tree | 9872305f73fb33564a11f50de9b0239e3a703974 /sync/android | |
parent | 50d1b1c62972353fe25772fd22e6fb317ebc80f9 (diff) | |
download | chromium_src-81abdf24465d84e2304b8245d2f51400436ce2e8.zip chromium_src-81abdf24465d84e2304b8245d2f51400436ce2e8.tar.gz chromium_src-81abdf24465d84e2304b8245d2f51400436ce2e8.tar.bz2 |
[Sync] Clean up PSS boolean getters for consistency.
When cleaning up ProfileSyncServiceAndroid I noticed these inconsistencies
but it seemed like PSS was the one that should be changed, not PSSA.
Renames:
- EncryptEverythingEnabled -> IsEncryptEverythingEnabled
- EncryptEverythingAllowed -> IsEncryptEverythingAllowed
- FirstSetupInProgress -> IsFirstSetupInProgress
- backend_initialized -> IsBackendInitialized
- setup_in_progress -> IsSetupInProgress
BUG=497518
TBR=rogerta,stevenjb,pam,sdefresne
Review URL: https://codereview.chromium.org/1321903005
Cr-Commit-Position: refs/heads/master@{#348178}
Diffstat (limited to 'sync/android')
-rw-r--r-- | sync/android/java/src/org/chromium/sync/PassphraseType.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sync/android/java/src/org/chromium/sync/PassphraseType.java b/sync/android/java/src/org/chromium/sync/PassphraseType.java index 8ef3d5a..8aa5879 100644 --- a/sync/android/java/src/org/chromium/sync/PassphraseType.java +++ b/sync/android/java/src/org/chromium/sync/PassphraseType.java @@ -74,15 +74,15 @@ public enum PassphraseType implements Parcelable { /** * Get the types that are allowed to be enabled from the current type. * - * @param encryptEverythingAllowed Whether encrypting all data is allowed. + * @param isEncryptEverythingAllowed Whether encrypting all data is allowed. */ - public Set<PassphraseType> getAllowedTypes(boolean encryptEverythingAllowed) { + public Set<PassphraseType> getAllowedTypes(boolean isEncryptEverythingAllowed) { Set<PassphraseType> allowedTypes = new HashSet<>(); switch (this) { case IMPLICIT_PASSPHRASE: // Intentional fall through. case KEYSTORE_PASSPHRASE: allowedTypes.add(this); - if (encryptEverythingAllowed) { + if (isEncryptEverythingAllowed) { allowedTypes.add(CUSTOM_PASSPHRASE); } break; |