summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-12 15:39:51 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-12 15:39:51 +0000
commit1b8e915c8c6abea7b2e776c489a018f32400c0b3 (patch)
treef09f7db83b21f4f0db275b5a798cf5f2937f53cd /chrome/app
parenta6bfb3f017b46b89e9df24fbcbbb9aaf264005b1 (diff)
downloadchromium_src-1b8e915c8c6abea7b2e776c489a018f32400c0b3.zip
chromium_src-1b8e915c8c6abea7b2e776c489a018f32400c0b3.tar.gz
chromium_src-1b8e915c8c6abea7b2e776c489a018f32400c0b3.tar.bz2
Makes the instant url managed by group policy.
BUG=64870 64922 TEST=none Review URL: http://codereview.chromium.org/6174002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71172 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/policy/policy_templates.grd6
-rw-r--r--chrome/app/policy/policy_templates.json9
2 files changed, 15 insertions, 0 deletions
diff --git a/chrome/app/policy/policy_templates.grd b/chrome/app/policy/policy_templates.grd
index ab256d5..b665271 100644
--- a/chrome/app/policy/policy_templates.grd
+++ b/chrome/app/policy/policy_templates.grd
@@ -714,6 +714,12 @@ templates and will be translated for each locale. -->
<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_DEFAULTSEARCHPROVIDERINSTANTURL_CAPTION" desc="The label of the 'Instant URL' text field in the 'Default Search Provider' policy settings page.">
+ Default search provider instant URL
+ </message>
+ <message name="IDS_POLICY_DEFAULTSEARCHPROVIDERINSTANTURL_DESC" desc="Caption of the 'Instant URL' text field in the 'Default Search Provider' policy settings page.">
+ Specifies the URL of the search engine used to provide instant results. 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>
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index e7a4463..274e00a 100644
--- a/chrome/app/policy/policy_templates.json
+++ b/chrome/app/policy/policy_templates.json
@@ -483,6 +483,15 @@
}
},
{
+ 'name': 'DefaultSearchProviderInstantURL',
+ 'type': 'string',
+ 'supported_on': ['chrome.*:10-'],
+ 'annotations': {
+ 'features': {'dynamic_refresh': 1},
+ 'example_value': 'http://search.my.company/suggest?q={searchTerms}',
+ }
+ },
+ {
'name': 'DefaultSearchProviderIconURL',
'type': 'string',
'supported_on': ['chrome.*:8-'],