summaryrefslogtreecommitdiffstats
path: root/chrome/app/policy
diff options
context:
space:
mode:
authorjeanluc@google.com <jeanluc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-08 22:22:41 +0000
committerjeanluc@google.com <jeanluc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-08 22:22:41 +0000
commit3c9991973f7f7423318277fe6595c89dfcceb2b1 (patch)
tree2ae6c2d4ffdfecbe8bae33e6a7d260f7b70193b6 /chrome/app/policy
parent317b5ebac41ab0358c0707de53c297b5d0013554 (diff)
downloadchromium_src-3c9991973f7f7423318277fe6595c89dfcceb2b1.zip
chromium_src-3c9991973f7f7423318277fe6595c89dfcceb2b1.tar.gz
chromium_src-3c9991973f7f7423318277fe6595c89dfcceb2b1.tar.bz2
Define the Default Search related policies so that the ADM, ADMX, and Mac related policy files are generated.
BUG=49306 TEST=Install the ADM file using gpedit.msc. Look that the fields appear there and when filled modify the Basic pane of Options dialog. Do the same for the Mac: add it to Workgroup Manager and see that the values can be specified. Review URL: http://codereview.chromium.org/3613011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62031 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/policy')
-rw-r--r--chrome/app/policy/policy_templates.grd57
-rw-r--r--chrome/app/policy/policy_templates.json76
2 files changed, 133 insertions, 0 deletions
diff --git a/chrome/app/policy/policy_templates.grd b/chrome/app/policy/policy_templates.grd
index 0b154e46..3d75ecb 100644
--- a/chrome/app/policy/policy_templates.grd
+++ b/chrome/app/policy/policy_templates.grd
@@ -478,7 +478,64 @@ templates and will be translated for each locale. -->
<message name="IDS_POLICY_RESTOREONSTARTUPURLS_DESC" desc="Description of the list editor 'restore startup urls' of the policy settings page 'restore on startup'.">
If 'Open a list of URLs' is selected as the startup action, this allows you to specify the list of URLs that are opened.
</message>
+ <message name="IDS_POLICY_DEFAULTSEARCHPROVIDER_CAPTION" desc="Caption of the group of 'Default Search Provider' related policies.">
+ Default search provider
+ </message>
+ <message name="IDS_POLICY_DEFAULTSEARCHPROVIDER_DESC" desc="Description of the group of 'Default Search Provider' related policies.">
+ Configures the default search provider. You can specify the default search provider that the user will use or choose to disable default search.
+ </message>
+ <message name="IDS_POLICY_DEFAULTSEARCHPROVIDERENABLED_CAPTION" desc="Caption of the 'Default Search Provider' policy.">
+ Enable the default search provider
+ </message>
+ <message name="IDS_POLICY_DEFAULTSEARCHPROVIDERENABLED_DESC" desc="Description of the 'Default Search Provider' policy.">
+ Enables the use of a default search provider.
+
+ If you enable this setting, a default search is performed when the user types text in the omnibox that is not a URL.
+
+ You can specify the default search provider to be used by setting the rest of the default search policies. If these are left empty, the user can choose the default provider.
+ If you diable this setting, no search is performed when the user enters non-URL text in the omnibox.
+
+ If you enable or disable this setting, users cannot change or override this setting in <ph name="PRODUCT_NAME">
+ $1<ex>Google Chrome</ex>
+ </ph>.
+ </message>
+ <message name="IDS_POLICY_DEFAULTSEARCHPROVIDERNAME_CAPTION" desc="The label of the 'Name' text field in the 'Default Search Provider' policy settings page.">
+ Default search provider name
+ </message>
+ <message name="IDS_POLICY_DEFAULTSEARCHPROVIDERNAME_DESC" desc="Caption of the 'Name' text field in the 'Default Search Provider' policy settings page.">
+ Specifies the name of the default search provider. If left empty, the host name specified by the search URL will be used.
+ </message>
+ <message name="IDS_POLICY_DEFAULTSEARCHPROVIDERKEYWORD_CAPTION" desc="The label of the 'Keyword' text field in the 'Default Search Provider' policy settings page.">
+ Default search provider keyword
+ </message>
+ <message name="IDS_POLICY_DEFAULTSEARCHPROVIDERKEYWORD_DESC" desc="Caption of the 'Keyword' text field in the 'Default Search Provider' policy settings page.">
+ Specifies the keyword, which is the shortcut used in the omnibox to trigger the search for this provider. Optional.
+ </message>
+ <message name="IDS_POLICY_DEFAULTSEARCHPROVIDERSEARCHURL_CAPTION" desc="The label of the 'Search URL' text field in the 'Default Search Provider' policy settings page.">
+ Default search provider search URL
+ </message>
+ <message name="IDS_POLICY_DEFAULTSEARCHPROVIDERSEARCHURL_DESC" desc="Caption of the 'Search URL' text field in the 'Default Search Provider' policy settings page.">
+ Specifies the URL of the search engine used when doing a default search. The URL should contain the string '<ph name="SEARCH_TERM_MARKER">{searchTerms}</ph>', which will be replaced at query time by the terms the user is searching for.
+ </message>
+ <message name="IDS_POLICY_DEFAULTSEARCHPROVIDERSUGGESTURL_CAPTION" desc="The label of the 'Suggest URL' text field in the 'Default Search Provider' policy settings page.">
+ Default search provider suggest URL
+ </message>
+ <message name="IDS_POLICY_DEFAULTSEARCHPROVIDERSUGGESTURL_DESC" desc="Caption of the 'Suggest URL' text field in the 'Default Search Provider' policy settings page.">
+ Specifies the URL of the search engine used to provide search suggestions. The URL should contain the string '<ph name="SEARCH_TERM_MARKER">{searchTerms}</ph>', which will be replaced at query time by the text the user has entered so far. Optional.
+ </message>
+ <message name="IDS_POLICY_DEFAULTSEARCHPROVIDERICONURL_CAPTION" desc="The label of the 'Icon URL' text field in the 'Default Search Provider' policy settings page.">
+ Default search provider icon
+ </message>
+ <message name="IDS_POLICY_DEFAULTSEARCHPROVIDERICONURL_DESC" desc="Caption of the 'Icon URL' text field in the 'Default Search Provider' policy settings page.">
+ Specifies the favorite icon URL of the default search provider. Optional.
+ </message>
+ <message name="IDS_POLICY_DEFAULTSEARCHPROVIDERENCODINGS_CAPTION" desc="The label of the 'Encodings' text field in the 'Default Search Provider' policy settings page.">
+ Default search provider encodings
+ </message>
+ <message name="IDS_POLICY_DEFAULTSEARCHPROVIDERENCODINGS_DESC" desc="Caption of the 'Encodings' text field in the 'Default Search Provider' policy settings page.">
+ Specifies the character encodings supported by the search provider. Encodings are code page names like UTF-8, GB2312, and ISO-8859-1. They are tried in the order provided. The default is UTF-8.
+ </message>
<!-- Begin Chrome Frame messages -->
<message name="IDS_POLICY_CHROMEFRAMERENDERERSETTINGS_CAPTION"
desc="Caption of Chrome Frame renderer policy group">
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index c3a314c..70a2c52 100644
--- a/chrome/app/policy/policy_templates.json
+++ b/chrome/app/policy/policy_templates.json
@@ -355,6 +355,82 @@
}]
},
{
+ 'name': 'DefaultSearchProvider',
+ 'type': 'group',
+ 'policies': [
+ {
+ 'name': 'DefaultSearchProviderEnabled',
+ 'type': 'main',
+ 'annotations': {
+ 'platforms': ['linux', 'mac', 'win'],
+ 'products': ['chrome'],
+ 'features': {'dynamic_refresh': 1},
+ 'example_value': True,
+ }
+ },
+ {
+ 'name': 'DefaultSearchProviderName',
+ 'type': 'string',
+ 'annotations': {
+ 'platforms': ['linux', 'mac', 'win'],
+ 'products': ['chrome'],
+ 'features': {'dynamic_refresh': 1},
+ 'example_value': 'My Intranet Search',
+ }
+ },
+ {
+ 'name': 'DefaultSearchProviderKeyword',
+ 'type': 'string',
+ 'annotations': {
+ 'platforms': ['linux', 'mac', 'win'],
+ 'products': ['chrome'],
+ 'features': {'dynamic_refresh': 1},
+ 'example_value': 'mis',
+ }
+ },
+ {
+ 'name': 'DefaultSearchProviderSearchURL',
+ 'type': 'string',
+ 'annotations': {
+ 'platforms': ['linux', 'mac', 'win'],
+ 'products': ['chrome'],
+ 'features': {'dynamic_refresh': 1},
+ 'example_value': 'http://search.my.company/search?q={searchTerms}',
+ }
+ },
+ {
+ 'name': 'DefaultSearchProviderSuggestURL',
+ 'type': 'string',
+ 'annotations': {
+ 'platforms': ['linux', 'mac', 'win'],
+ 'products': ['chrome'],
+ 'features': {'dynamic_refresh': 1},
+ 'example_value': 'http://search.my.company/suggest?q={searchTerms}',
+ }
+ },
+ {
+ 'name': 'DefaultSearchProviderIconURL',
+ 'type': 'string',
+ 'annotations': {
+ 'platforms': ['linux', 'mac', 'win'],
+ 'products': ['chrome'],
+ 'features': {'dynamic_refresh': 1},
+ 'example_value': 'http://search.my.company/favicon.ico',
+ }
+ },
+ {
+ 'name': 'DefaultSearchProviderEncodings',
+ 'type': 'list',
+ 'annotations': {
+ 'platforms': ['linux', 'mac', 'win'],
+ 'products': ['chrome'],
+ 'features': {'dynamic_refresh': 1},
+ 'example_value': ['UTF-8', 'UTF-16', 'GB2312', 'ISO-8859-1']
+ }
+ },
+ ]
+ },
+ {
'name': 'ChromeFrameRendererSettings',
'type': 'group',
'policies': [{