diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-01 17:16:28 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-01 17:16:28 +0000 |
| commit | 937dbb5756153008627891801758f3c1710f89d6 (patch) | |
| tree | c7a8abdfd2996a3ce202f1dc2ccafc6bd49fed2d /components/policy_strings.grdp | |
| parent | 7e4907d8d332a4ca11066a917f156c1b8424ec77 (diff) | |
| download | chromium_src-937dbb5756153008627891801758f3c1710f89d6.zip chromium_src-937dbb5756153008627891801758f3c1710f89d6.tar.gz chromium_src-937dbb5756153008627891801758f3c1710f89d6.tar.bz2 | |
Enable the ManagedBookmarks policy on all platforms.
This CL makes a couple more changes to accomodate for the implementation
of this policy:
- moved the kManagedBookmarks pref into the bookmarks component, so that
it can be referred to from there;
- moved the strings for the managed bookmarks folder name for the same
reasons;
- updated the policy schema to support child bookmarks;
- updated the ManagedBookmarksPolicyHandler to use the schema validation
code, and added a new unit test for that.
TBR=nyquist@chromium.org
BUG=49598
Review URL: https://codereview.chromium.org/307993005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/policy_strings.grdp')
| -rw-r--r-- | components/policy_strings.grdp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/components/policy_strings.grdp b/components/policy_strings.grdp index 502b5b7..de2e5eb 100644 --- a/components/policy_strings.grdp +++ b/components/policy_strings.grdp @@ -298,16 +298,7 @@ <message name="IDS_POLICY_LEVEL_MANDATORY" desc="Text displayed in the Level column when a policy is mandatory."> Mandatory </message> - - <if expr="is_android or is_ios"> - <message name="IDS_POLICY_MANAGED_BOOKMARKS" desc="Mobile: name of the managed bookmarks folder"> - <ph name="DOMAIN">$1<ex>google.com</ex></ph> bookmarks - </message> - <message name="IDS_POLICY_MANAGED_BOOKMARKS_DEFAULT_NAME" desc="Mobile: name of the managed bookmarks folder when the management domain can't be determined."> - Managed bookmarks - </message> - <message name="IDS_POLICY_INVALID_BOOKMARK" desc="Text displayed in the status column when an entry of the ManagedBookmarks policy is not a valid bookmark."> - Ignored invalid bookmark at index <ph name="ENTRY_INDEX">$1<ex>3</ex></ph> - </message> - </if> + <message name="IDS_POLICY_INVALID_BOOKMARK" desc="Text displayed in the status column when an entry of the ManagedBookmarks policy is not a valid bookmark."> + Ignored invalid bookmark at index <ph name="ENTRY_INDEX">$1<ex>3</ex></ph> + </message> </grit-part> |