summaryrefslogtreecommitdiffstats
path: root/sync/android
diff options
context:
space:
mode:
authorbauerb <bauerb@chromium.org>2014-12-26 11:53:13 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-26 19:54:13 +0000
commit4da36131ebbf931a83c217598354812cf0203b24 (patch)
tree2570a6fb1e4a60f08753fee26e6944e99a38d9e7 /sync/android
parent41f4208c1554faa1b61555f98fed491c125b7949 (diff)
downloadchromium_src-4da36131ebbf931a83c217598354812cf0203b24.zip
chromium_src-4da36131ebbf931a83c217598354812cf0203b24.tar.gz
chromium_src-4da36131ebbf931a83c217598354812cf0203b24.tar.bz2
Implement SupervisedUserWhitelistService.
BUG=436459 Review URL: https://codereview.chromium.org/807183002 Cr-Commit-Position: refs/heads/master@{#309677}
Diffstat (limited to 'sync/android')
-rw-r--r--sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java b/sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
index fae203b..1bebdfc 100644
--- a/sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
+++ b/sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
@@ -78,7 +78,11 @@ public enum ModelType {
* A supervised user setting object. The old name "managed user" is used for backwards
* compatibility.
*/
- MANAGED_USER_SETTING("MANAGED_USER_SETTING");
+ MANAGED_USER_SETTING("MANAGED_USER_SETTING"),
+ /**
+ * A supervised user whitelist object.
+ */
+ MANAGED_USER_WHITELIST("MANAGED_USER_WHITELIST");
/** Special type representing all possible types. */
public static final String ALL_TYPES_TYPE = "ALL_TYPES";