summaryrefslogtreecommitdiffstats
path: root/build/ios
diff options
context:
space:
mode:
authormnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-28 18:44:20 +0000
committermnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-28 18:44:20 +0000
commitaa61fb7124b239850775f142d31f57b48c47eafb (patch)
tree4a6682f4303bb810fdc887ab3eedd4bfe7b93239 /build/ios
parentfb666d0d819d77f397cf4591fa7de4bf437a6bbc (diff)
downloadchromium_src-aa61fb7124b239850775f142d31f57b48c47eafb.zip
chromium_src-aa61fb7124b239850775f142d31f57b48c47eafb.tar.gz
chromium_src-aa61fb7124b239850775f142d31f57b48c47eafb.tar.bz2
Add error message for domain mismatch on re-enrollment.
This error shows up if the server indicates to the client that enrollment got rejected due to the device belonging do a different domain (as indicated by the client-provided state key). BUG=chromium:357207 TEST=Manual, check that the error message shows up on domain mismatch. R=asvitkine@chromium.org, dpolukhin@chromium.org, joaodasilva@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=260102 Review URL: https://codereview.chromium.org/214963002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260216 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/ios')
-rw-r--r--build/ios/grit_whitelist.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt
index 6583829..666af97 100644
--- a/build/ios/grit_whitelist.txt
+++ b/build/ios/grit_whitelist.txt
@@ -700,6 +700,7 @@ IDS_POLICY_DM_STATUS_SERVICE_ACTIVATION_PENDING
IDS_POLICY_DM_STATUS_SERVICE_DEPROVISIONED
IDS_POLICY_DM_STATUS_SERVICE_DEVICE_ID_CONFLICT
IDS_POLICY_DM_STATUS_SERVICE_DEVICE_NOT_FOUND
+IDS_POLICY_DM_STATUS_SERVICE_DOMAIN_MISMATCH
IDS_POLICY_DM_STATUS_SERVICE_INVALID_SERIAL_NUMBER
IDS_POLICY_DM_STATUS_SERVICE_MANAGEMENT_NOT_SUPPORTED
IDS_POLICY_DM_STATUS_SERVICE_MANAGEMENT_TOKEN_INVALID