diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index ab922d9c268a..252d9f32529e 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -216,12 +216,6 @@ pref("browser.search.log", false); // Ordering of Search Engines in the Engine list. pref("browser.search.order.1", "chrome://browser-region/locale/region.properties"); pref("browser.search.order.2", "chrome://browser-region/locale/region.properties"); - -pref("browser.search.param.Google.1.default", "chrome://branding/content/searchconfig.properties"); -pref("browser.search.param.Google.1.custom", "chrome://branding/content/searchconfig.properties"); -pref("browser.search.order.Yahoo.1", "chrome://branding/content/searchconfig.properties"); -pref("browser.search.order.Yahoo.2", "chrome://branding/content/searchconfig.properties"); -pref("browser.search.order.Yahoo", "chrome://branding/content/searchconfig.properties"); // search bar results always open in a new tab pref("browser.search.openintab", false); diff --git a/browser/base/branding/searchconfig.properties b/browser/base/branding/searchconfig.properties deleted file mode 100644 index 3431e057e63d..000000000000 --- a/browser/base/branding/searchconfig.properties +++ /dev/null @@ -1,6 +0,0 @@ -# Do NOT localize or otherwise change these values -browser.search.param.Google.1.custom=client=firefox -browser.search.param.Google.1.default=client=firefox -browser.search.param.Google.release=rls=%S:%S:unofficial - -browser.search.param.Yahoo.release=rls=%S:%S:unofficial \ No newline at end of file diff --git a/browser/base/jar.mn b/browser/base/jar.mn index 618808617811..b7881547e938 100644 --- a/browser/base/jar.mn +++ b/browser/base/jar.mn @@ -57,7 +57,6 @@ browser.jar: content/branding/about.png (branding/about.png) content/branding/aboutCredits.png (branding/aboutCredits.png) content/branding/aboutFooter.png (branding/aboutFooter.png) - content/branding/searchconfig.properties (branding/searchconfig.properties) content/branding/icon48.png (branding/icon48.png) content/branding/icon64.png (branding/icon64.png) #ifdef XP_WIN diff --git a/browser/branding/unofficial/content/jar.mn b/browser/branding/unofficial/content/jar.mn index 2d3b0c18bb61..658c16a66315 100644 --- a/browser/branding/unofficial/content/jar.mn +++ b/browser/branding/unofficial/content/jar.mn @@ -3,7 +3,6 @@ browser.jar: content/branding/about.png (about.png) content/branding/aboutCredits.png (aboutCredits.png) content/branding/aboutFooter.png (aboutFooter.png) - content/branding/searchconfig.properties (searchconfig.properties) content/branding/icon48.png (icon48.png) content/branding/icon64.png (icon64.png) #ifdef XP_WIN diff --git a/browser/branding/unofficial/content/searchconfig.properties b/browser/branding/unofficial/content/searchconfig.properties deleted file mode 100644 index 3431e057e63d..000000000000 --- a/browser/branding/unofficial/content/searchconfig.properties +++ /dev/null @@ -1,6 +0,0 @@ -# Do NOT localize or otherwise change these values -browser.search.param.Google.1.custom=client=firefox -browser.search.param.Google.1.default=client=firefox -browser.search.param.Google.release=rls=%S:%S:unofficial - -browser.search.param.Yahoo.release=rls=%S:%S:unofficial \ No newline at end of file diff --git a/other-licenses/branding/firefox/content/jar.mn b/other-licenses/branding/firefox/content/jar.mn index 2d3b0c18bb61..658c16a66315 100644 --- a/other-licenses/branding/firefox/content/jar.mn +++ b/other-licenses/branding/firefox/content/jar.mn @@ -3,7 +3,6 @@ browser.jar: content/branding/about.png (about.png) content/branding/aboutCredits.png (aboutCredits.png) content/branding/aboutFooter.png (aboutFooter.png) - content/branding/searchconfig.properties (searchconfig.properties) content/branding/icon48.png (icon48.png) content/branding/icon64.png (icon64.png) #ifdef XP_WIN diff --git a/other-licenses/branding/firefox/content/searchconfig.properties b/other-licenses/branding/firefox/content/searchconfig.properties deleted file mode 100644 index 9a3aa143492a..000000000000 --- a/other-licenses/branding/firefox/content/searchconfig.properties +++ /dev/null @@ -1,9 +0,0 @@ -# Do NOT localize or otherwise change these values -browser.search.param.Google.1.custom=client=firefox -browser.search.param.Google.1.default=client=firefox-a -browser.search.param.Google.release=rls=%S:%S:official - -browser.search.order.Yahoo.1=fr=moz1 -browser.search.order.Yahoo.2=fr=moz2 -browser.search.order.Yahoo=fr=moz3 -browser.search.param.Yahoo.release=rls=%S:%S:official