Bug 1531893 - Add support for search channel. r=mikedeboer
authorMichael Kaply <mozilla@kaply.com>
Wed, 06 Mar 2019 09:31:47 +0000
changeset 463156 f001c13667acf1ffe2728d95ade809e8b8819bf4
parent 463155 551248df6193f5630f93f56a9e2d147c9cfc5744
child 463157 b56791a96f96525d2d4fbec907f6c7c58a9e3dcc
push id35668
push userbtara@mozilla.com
push dateFri, 08 Mar 2019 21:50:53 +0000
treeherdermozilla-central@14778fd00dc5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmikedeboer
bugs1531893
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1531893 - Add support for search channel. r=mikedeboer Differential Revision: https://phabricator.services.mozilla.com/D22169
browser/components/search/searchplugins/google-2018.xml
browser/components/search/searchplugins/google-b-1-d.xml
browser/components/search/searchplugins/google-b-1-e.xml
browser/components/search/searchplugins/google-b-d.xml
browser/components/search/searchplugins/google-b-e.xml
browser/components/search/searchplugins/google.xml
--- a/browser/components/search/searchplugins/google-2018.xml
+++ b/browser/components/search/searchplugins/google-2018.xml
@@ -6,11 +6,12 @@
 <ShortName>Google</ShortName>
 <Description>Google Search</Description>
 <InputEncoding>UTF-8</InputEncoding>
 <Image width="16" height="16">resource://search-plugins/images/google.ico</Image>
 <Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&amp;q={searchTerms}"/>
 <Url type="text/html" method="GET" template="https://www.google.com/search" rel="searchform">
   <MozParam name="client" condition="purpose" purpose="keyword" value="firefox-b-1-ab"/>
   <MozParam name="client" condition="purpose" purpose="searchbar" value="firefox-b-1"/>
+  <MozParam name="channel" condition="pref" pref="google_channel_us"/>
   <Param name="q" value="{searchTerms}"/>
 </Url>
 </SearchPlugin>
--- a/browser/components/search/searchplugins/google-b-1-d.xml
+++ b/browser/components/search/searchplugins/google-b-1-d.xml
@@ -5,11 +5,12 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Google</ShortName>
 <Description>Google Search</Description>
 <InputEncoding>UTF-8</InputEncoding>
 <Image width="16" height="16">resource://search-plugins/images/google.ico</Image>
 <Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&amp;q={searchTerms}"/>
 <Url type="text/html" method="GET" template="https://www.google.com/search" rel="searchform">
   <Param name="client" value="firefox-b-1-d"/>
+  <MozParam name="channel" condition="pref" pref="google_channel_us"/>
   <Param name="q" value="{searchTerms}"/>
 </Url>
 </SearchPlugin>
--- a/browser/components/search/searchplugins/google-b-1-e.xml
+++ b/browser/components/search/searchplugins/google-b-1-e.xml
@@ -5,11 +5,12 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Google</ShortName>
 <Description>Google Search</Description>
 <InputEncoding>UTF-8</InputEncoding>
 <Image width="16" height="16">resource://search-plugins/images/google.ico</Image>
 <Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&amp;q={searchTerms}"/>
 <Url type="text/html" method="GET" template="https://www.google.com/search" rel="searchform">
   <Param name="client" value="firefox-b-1-e"/>
+  <MozParam name="channel" condition="pref" pref="google_channel_us"/>
   <Param name="q" value="{searchTerms}"/>
 </Url>
 </SearchPlugin>
--- a/browser/components/search/searchplugins/google-b-d.xml
+++ b/browser/components/search/searchplugins/google-b-d.xml
@@ -5,11 +5,12 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Google</ShortName>
 <Description>Google Search</Description>
 <InputEncoding>UTF-8</InputEncoding>
 <Image width="16" height="16">resource://search-plugins/images/google.ico</Image>
 <Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&amp;q={searchTerms}"/>
 <Url type="text/html" method="GET" template="https://www.google.com/search" rel="searchform">
   <Param name="client" value="firefox-b-d"/>
+  <MozParam name="channel" condition="pref" pref="google_channel_row"/>
   <Param name="q" value="{searchTerms}"/>
 </Url>
 </SearchPlugin>
--- a/browser/components/search/searchplugins/google-b-e.xml
+++ b/browser/components/search/searchplugins/google-b-e.xml
@@ -5,11 +5,12 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Google</ShortName>
 <Description>Google Search</Description>
 <InputEncoding>UTF-8</InputEncoding>
 <Image width="16" height="16">resource://search-plugins/images/google.ico</Image>
 <Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&amp;q={searchTerms}"/>
 <Url type="text/html" method="GET" template="https://www.google.com/search" rel="searchform">
   <Param name="client" value="firefox-b-e"/>
+  <MozParam name="channel" condition="pref" pref="google_channel_row"/>
   <Param name="q" value="{searchTerms}"/>
 </Url>
 </SearchPlugin>
--- a/browser/components/search/searchplugins/google.xml
+++ b/browser/components/search/searchplugins/google.xml
@@ -6,11 +6,12 @@
 <ShortName>Google</ShortName>
 <Description>Google Search</Description>
 <InputEncoding>UTF-8</InputEncoding>
 <Image width="16" height="16">resource://search-plugins/images/google.ico</Image>
 <Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&amp;q={searchTerms}"/>
 <Url type="text/html" method="GET" template="https://www.google.com/search" rel="searchform">
   <MozParam name="client" condition="purpose" purpose="keyword" value="firefox-b-ab"/>
   <MozParam name="client" condition="purpose" purpose="searchbar" value="firefox-b"/>
+  <MozParam name="channel" condition="pref" pref="google_channel_row"/>
   <Param name="q" value="{searchTerms}"/>
 </Url>
 </SearchPlugin>