summaryrefslogtreecommitdiffstats
path: root/chrome/app/policy
diff options
context:
space:
mode:
authorgrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 16:29:53 +0000
committergrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 16:29:53 +0000
commita9fb0168116ecc4d2a6b648894990b259c9873e2 (patch)
treece0b6ce07ee80a5c2da3c0d892bc357a14c9947e /chrome/app/policy
parent4ce4e79ded4b4932bcf479a4760bbb226410ff15 (diff)
downloadchromium_src-a9fb0168116ecc4d2a6b648894990b259c9873e2.zip
chromium_src-a9fb0168116ecc4d2a6b648894990b259c9873e2.tar.gz
chromium_src-a9fb0168116ecc4d2a6b648894990b259c9873e2.tar.bz2
Add a new GP object for Chrome Frame's user data dir. When chrome.exe is running as Chrome Frame, this new GPO will be consulted for the base location of the user data dirs. If not set, chrome.exe will use the command-line provided data dir rather than the Chrome-specific GPO.
BUG=80516 TEST=See repro steps in the bug report R=pastarmovj@chromium.org Review URL: http://codereview.chromium.org/6932019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/policy')
-rw-r--r--chrome/app/policy/policy_templates.json15
1 files changed, 14 insertions, 1 deletions
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index 8e433c5..aaf07ec 100644
--- a/chrome/app/policy/policy_templates.json
+++ b/chrome/app/policy/policy_templates.json
@@ -94,7 +94,7 @@
# persistent IDs for all fields (but not for groups!) are needed. These are
# specified by the 'id' keys of each policy. NEVER CHANGE EXISTING IDs,
# because doing so would break the deployed wire format!
-# For your editing convenience: highest ID currently used: 89
+# For your editing convenience: highest ID currently used: 87
#
# Placeholders:
# The following placeholder strings are automatically substituted:
@@ -1510,6 +1510,19 @@
If this setting is not set, users can open file selection dialogs as normal.''',
},
+ {
+ 'name': 'GCFUserDataDir',
+ 'type': 'string',
+ 'supported_on': ['chrome_frame:12-'],
+ 'features': {'dynamic_refresh': 0},
+ 'example_value': '${user_home}/Chrome Frame',
+ 'id': 87,
+ 'caption': '''Set <ph name="PRODUCT_NAME">$3<ex>Google Chrome Frame</ex></ph> user data directory''',
+ 'desc': '''Configures the directory that <ph name="PRODUCT_NAME">$3<ex>Google Chrome Frame</ex></ph> will use for storing user data.
+
+ If you set this policy, <ph name="PRODUCT_NAME">$3<ex>Google Chrome Frame</ex></ph> will use the provided directory.''',
+ 'label': '''Set user data directory''',
+ },
],
'messages': {
# Messages that are not associated to any policies.