summaryrefslogtreecommitdiffstats
path: root/build/ios
diff options
context:
space:
mode:
authorjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-13 20:45:28 +0000
committerjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-13 20:45:28 +0000
commit8d8e5d5eca2c47bf8e6cec2e58e95899ed26b11d (patch)
tree3219abb0c19a9727e5ac372339f2bb3497c75d0c /build/ios
parentd2c52f326c710b122e554b29782f9aed0b63c203 (diff)
downloadchromium_src-8d8e5d5eca2c47bf8e6cec2e58e95899ed26b11d.zip
chromium_src-8d8e5d5eca2c47bf8e6cec2e58e95899ed26b11d.tar.gz
chromium_src-8d8e5d5eca2c47bf8e6cec2e58e95899ed26b11d.tar.bz2
Moved the ManagedBookmarksPolicyHandler to a shared file.
This change allows reusing that policy handler on iOS too. The strings used by this handler are also included on iOS builds now. BUG=349983 Review URL: https://codereview.chromium.org/199233002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/ios')
-rw-r--r--build/ios/grit_whitelist.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt
index d750fe1..e5a67be 100644
--- a/build/ios/grit_whitelist.txt
+++ b/build/ios/grit_whitelist.txt
@@ -712,9 +712,12 @@ IDS_POLICY_DM_STATUS_SERVICE_POLICY_NOT_FOUND
IDS_POLICY_DM_STATUS_SUCCESS
IDS_POLICY_DM_STATUS_TEMPORARY_UNAVAILABLE
IDS_POLICY_DM_STATUS_UNKNOWN_ERROR
+IDS_POLICY_INVALID_BOOKMARK
IDS_POLICY_INVALID_PROXY_MODE_ERROR
IDS_POLICY_INVALID_SEARCH_URL_ERROR
IDS_POLICY_LIST_ENTRY_ERROR
+IDS_POLICY_MANAGED_BOOKMARKS
+IDS_POLICY_MANAGED_BOOKMARKS_DEFAULT_NAME
IDS_POLICY_NOT_SPECIFIED_ERROR
IDS_POLICY_OUT_OF_RANGE_ERROR
IDS_POLICY_OVERRIDDEN