diff options
author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 13:40:38 +0000 |
---|---|---|
committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 13:40:38 +0000 |
commit | 1b8acdba23bba89eb14877c3964415eb0f3b8dfb (patch) | |
tree | 140104e98f12672576b8060ae2570d92a57ac9b0 /chrome/app | |
parent | f3b2b8d149f79bcbc3f6f89115654e69bf7818fe (diff) | |
download | chromium_src-1b8acdba23bba89eb14877c3964415eb0f3b8dfb.zip chromium_src-1b8acdba23bba89eb14877c3964415eb0f3b8dfb.tar.gz chromium_src-1b8acdba23bba89eb14877c3964415eb0f3b8dfb.tar.bz2 |
Added a policy to manage mobile bookmarks on Android.
This policy controls a "Managed bookmarks" folder within the "Mobile bookmarks",
which isn't part of the user's boomarks model. These bookmarks can't be edited,
and are not synced to the user account.
BUG=265643
R=pneubeck@chromium.org, tedchoc@chromium.org
Review URL: https://codereview.chromium.org/21121004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r-- | chrome/app/generated_resources.grd | 9 | ||||
-rw-r--r-- | chrome/app/policy/policy_templates.json | 34 |
2 files changed, 43 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index e52871b..e64556f 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -6148,6 +6148,9 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_POLICY_UNKNOWN" desc="Text displayed in the status column when a policy name is not recognized."> Unknown policy. </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> <!-- chrome://policy --> <message name="IDS_POLICY_TITLE" desc="Page title and the title of the section that lists policies."> @@ -6236,6 +6239,12 @@ Keep your key file in a safe place. You will need it to create new versions of y Mandatory </message> + <if expr="is_android"> + <message name="IDS_POLICY_MANAGED_BOOKMARKS" desc="Mobile: name of the managed bookmarks folder"> + Managed bookmarks + </message> + </if> + <!-- about:flags --> <message name="IDS_FLAGS_LONG_TITLE" desc="Long version of the title for the about:flags page."> Careful, these experiments may bite diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json index 86bc3ac..3a32920 100644 --- a/chrome/app/policy/policy_templates.json +++ b/chrome/app/policy/policy_templates.json @@ -5253,6 +5253,40 @@ }, ], }, + # TODO(joaodasilva): replace the 'dict' type with a more generic + # 'json' type. The actual schema type for this should be 'array'. + { + 'name': 'ManagedBookmarks', + 'type': 'dict', + 'schema': { + 'type': 'object', + 'items': { + 'type': 'object', + 'properties': { + 'name': { 'type': 'string' }, + 'url': { 'type': 'string' }, + }, + }, + }, + 'supported_on': ['android:30-'], + 'features': { + 'dynamic_refresh': True, + 'per_profile': True, + }, + 'future': True, + 'example_value': { "name": "Google", "url": "google.com" }, + 'id': 227, + 'caption': '''Managed Bookmarks''', + 'desc': '''Configures a list of managed bookmarks. + + The policy is a list of bookmarks, and each bookmark is a dictionary containing the bookmark "name" and target "url". + + These bookmarks are placed in a Managed bookmarks folder inside the Mobile bookmarks. These bookmarks can't be modified by the user. + + When this policy is set then the Managed bookmarks are the default folder opened when the bookmarks view is opened in Chrome. + + Managed bookmarks are not synced to the user account.''', + }, ], 'messages': { # Messages that are not associated to any policies. |