summaryrefslogtreecommitdiffstats
path: root/build/ios
diff options
context:
space:
mode:
authormnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-28 11:13:52 +0000
committermnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-28 11:13:52 +0000
commit55b3a2460f0477558a8d293a087f7654475a0401 (patch)
tree2994d6c9abafbb2331906bc47fe7b7e57c39e261 /build/ios
parent463b15c7d025779615514adf3f1540d30a6366d1 (diff)
downloadchromium_src-55b3a2460f0477558a8d293a087f7654475a0401.zip
chromium_src-55b3a2460f0477558a8d293a087f7654475a0401.tar.gz
chromium_src-55b3a2460f0477558a8d293a087f7654475a0401.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 Review URL: https://codereview.chromium.org/214963002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260102 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