From 5827661e3391221bd5142e6b1ba5206a6d044962 Mon Sep 17 00:00:00 2001 From: Mike Perry Date: Fri, 5 May 2017 03:41:57 -0700 Subject: [PATCH] Omnibox: Add DDG, Startpage, Youtube, Twitter; remove Amazon, eBay, bing eBay and Amazon don't treat Tor users very well. Accounts often get locked and payments reversed. Also: Bug 16322: Update DuckDuckGo search engine We are replacing the clearnet URL with an onion service one (thanks to a patch by a cypherpunk) and are removing the duplicated DDG search engine. Duplicating DDG happend due to bug 1061736 where Mozilla included DDG itself into Firefox. Interestingly, this caused breaking the DDG search if JavaScript is disabled as the Mozilla engine, which gets loaded earlier, does not use the html version of the search page. Moreover, the Mozilla engine tracked where the users were searching from by adding a respective parameter to the search query. We got rid of that feature as well. Also: This fixes bug 20809: the DuckDuckGo team has changed its server-side code in a way that lets users with JavaScript enabled use the default landing page while those without JavaScript available get redirected directly to the non-JS page. We adapt the search engine URLs accordingly. Also fixes bug 29798 by making sure we only specify the Google search engine we actually ship an .xml file for. --- browser/app/profile/000-tor-browser.js | 6 +- .../search/extensions/ddg-onion/favicon.ico | Bin 0 -> 973 bytes .../search/extensions/ddg-onion/manifest.json | 26 ++++ .../search/extensions/ddg/favicon.ico | Bin 5430 -> 0 bytes .../search/extensions/ddg/favicon.png | Bin 0 -> 1150 bytes .../search/extensions/ddg/manifest.json | 44 +----- .../google/_locales/b-1-d/messages.json | 23 --- .../google/_locales/b-1-e/messages.json | 23 --- .../google/_locales/b-d/messages.json | 23 --- .../google/_locales/b-e/messages.json | 23 --- .../google/_locales/en/messages.json | 24 --- .../search/extensions/google/manifest.json | 17 +-- .../components/search/extensions/list.json | 141 +++++------------- .../search/extensions/startpage/favicon.png | Bin 0 -> 1150 bytes .../search/extensions/startpage/manifest.json | 26 ++++ .../twitter/_locales/en/messages.json | 17 --- .../twitter/_locales/ja/messages.json | 17 --- .../search/extensions/twitter/manifest.json | 13 +- .../wikipedia/_locales/NN/messages.json | 20 --- .../wikipedia/_locales/NO/messages.json | 20 --- .../wikipedia/_locales/af/messages.json | 20 --- .../wikipedia/_locales/an/messages.json | 20 --- .../wikipedia/_locales/ar/messages.json | 20 --- .../wikipedia/_locales/as/messages.json | 20 --- .../wikipedia/_locales/ast/messages.json | 20 --- .../wikipedia/_locales/az/messages.json | 20 --- .../_locales/be-tarask/messages.json | 20 --- .../wikipedia/_locales/be/messages.json | 20 --- .../wikipedia/_locales/bg/messages.json | 20 --- .../wikipedia/_locales/bn/messages.json | 20 --- .../wikipedia/_locales/br/messages.json | 20 --- .../wikipedia/_locales/bs/messages.json | 20 --- .../wikipedia/_locales/ca/messages.json | 20 --- .../wikipedia/_locales/crh/messages.json | 20 --- .../wikipedia/_locales/cy/messages.json | 20 --- .../wikipedia/_locales/cz/messages.json | 20 --- .../wikipedia/_locales/da/messages.json | 20 --- .../wikipedia/_locales/de/messages.json | 20 --- .../wikipedia/_locales/dsb/messages.json | 20 --- .../wikipedia/_locales/el/messages.json | 20 --- .../wikipedia/_locales/en/messages.json | 20 --- .../wikipedia/_locales/eo/messages.json | 20 --- .../wikipedia/_locales/es/messages.json | 20 --- .../wikipedia/_locales/et/messages.json | 20 --- .../wikipedia/_locales/eu/messages.json | 20 --- .../wikipedia/_locales/fa/messages.json | 20 --- .../wikipedia/_locales/fi/messages.json | 20 --- .../wikipedia/_locales/fr/messages.json | 20 --- .../wikipedia/_locales/fy-NL/messages.json | 20 --- .../wikipedia/_locales/ga-IE/messages.json | 20 --- .../wikipedia/_locales/gd/messages.json | 20 --- .../wikipedia/_locales/gl/messages.json | 20 --- .../wikipedia/_locales/gn/messages.json | 20 --- .../wikipedia/_locales/gu/messages.json | 20 --- .../wikipedia/_locales/he/messages.json | 20 --- .../wikipedia/_locales/hi/messages.json | 20 --- .../wikipedia/_locales/hr/messages.json | 20 --- .../wikipedia/_locales/hsb/messages.json | 20 --- .../wikipedia/_locales/hu/messages.json | 20 --- .../wikipedia/_locales/hy/messages.json | 20 --- .../wikipedia/_locales/ia/messages.json | 20 --- .../wikipedia/_locales/id/messages.json | 20 --- .../wikipedia/_locales/is/messages.json | 20 --- .../wikipedia/_locales/it/messages.json | 20 --- .../wikipedia/_locales/ja/messages.json | 20 --- .../wikipedia/_locales/ka/messages.json | 20 --- .../wikipedia/_locales/kab/messages.json | 20 --- .../wikipedia/_locales/kk/messages.json | 20 --- .../wikipedia/_locales/km/messages.json | 20 --- .../wikipedia/_locales/kn/messages.json | 20 --- .../wikipedia/_locales/kr/messages.json | 20 --- .../wikipedia/_locales/lij/messages.json | 20 --- .../wikipedia/_locales/lo/messages.json | 20 --- .../wikipedia/_locales/lt/messages.json | 20 --- .../wikipedia/_locales/ltg/messages.json | 20 --- .../wikipedia/_locales/lv/messages.json | 20 --- .../wikipedia/_locales/mk/messages.json | 20 --- .../wikipedia/_locales/ml/messages.json | 20 --- .../wikipedia/_locales/mr/messages.json | 20 --- .../wikipedia/_locales/ms/messages.json | 20 --- .../wikipedia/_locales/my/messages.json | 20 --- .../wikipedia/_locales/ne/messages.json | 20 --- .../wikipedia/_locales/nl/messages.json | 20 --- .../wikipedia/_locales/oc/messages.json | 20 --- .../wikipedia/_locales/or/messages.json | 20 --- .../wikipedia/_locales/pa/messages.json | 20 --- .../wikipedia/_locales/pl/messages.json | 20 --- .../wikipedia/_locales/pt/messages.json | 20 --- .../wikipedia/_locales/rm/messages.json | 20 --- .../wikipedia/_locales/ro/messages.json | 20 --- .../wikipedia/_locales/ru/messages.json | 20 --- .../wikipedia/_locales/si/messages.json | 20 --- .../wikipedia/_locales/sk/messages.json | 20 --- .../wikipedia/_locales/sl/messages.json | 20 --- .../wikipedia/_locales/sq/messages.json | 20 --- .../wikipedia/_locales/sr/messages.json | 20 --- .../wikipedia/_locales/sv-SE/messages.json | 20 --- .../wikipedia/_locales/ta/messages.json | 20 --- .../wikipedia/_locales/te/messages.json | 20 --- .../wikipedia/_locales/th/messages.json | 20 --- .../wikipedia/_locales/tl/messages.json | 20 --- .../wikipedia/_locales/tr/messages.json | 20 --- .../wikipedia/_locales/uk/messages.json | 20 --- .../wikipedia/_locales/ur/messages.json | 20 --- .../wikipedia/_locales/uz/messages.json | 20 --- .../wikipedia/_locales/vi/messages.json | 20 --- .../wikipedia/_locales/wo/messages.json | 20 --- .../wikipedia/_locales/zh-CN/messages.json | 20 --- .../wikipedia/_locales/zh-TW/messages.json | 20 --- .../search/extensions/wikipedia/manifest.json | 17 +-- .../search/extensions/yahoo/favicon.ico | Bin 0 -> 5430 bytes .../search/extensions/yahoo/manifest.json | 28 ++++ .../search/extensions/youtube/favicon.ico | Bin 0 -> 1150 bytes .../search/extensions/youtube/manifest.json | 26 ++++ 114 files changed, 174 insertions(+), 2140 deletions(-) create mode 100644 browser/components/search/extensions/ddg-onion/favicon.ico create mode 100644 browser/components/search/extensions/ddg-onion/manifest.json delete mode 100644 browser/components/search/extensions/ddg/favicon.ico create mode 100644 browser/components/search/extensions/ddg/favicon.png delete mode 100644 browser/components/search/extensions/google/_locales/b-1-d/messages.json delete mode 100644 browser/components/search/extensions/google/_locales/b-1-e/messages.json delete mode 100644 browser/components/search/extensions/google/_locales/b-d/messages.json delete mode 100644 browser/components/search/extensions/google/_locales/b-e/messages.json delete mode 100644 browser/components/search/extensions/google/_locales/en/messages.json create mode 100644 browser/components/search/extensions/startpage/favicon.png create mode 100644 browser/components/search/extensions/startpage/manifest.json delete mode 100644 browser/components/search/extensions/twitter/_locales/en/messages.json delete mode 100644 browser/components/search/extensions/twitter/_locales/ja/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/NN/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/NO/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/af/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/an/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/ar/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/as/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/ast/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/az/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/be-tarask/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/be/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/bg/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/bn/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/br/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/bs/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/ca/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/crh/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/cy/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/cz/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/da/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/de/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/dsb/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/el/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/en/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/eo/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/es/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/et/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/eu/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/fa/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/fi/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/fr/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/fy-NL/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/ga-IE/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/gd/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/gl/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/gn/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/gu/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/he/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/hi/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/hr/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/hsb/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/hu/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/hy/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/ia/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/id/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/is/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/it/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/ja/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/ka/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/kab/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/kk/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/km/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/kn/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/kr/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/lij/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/lo/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/lt/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/ltg/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/lv/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/mk/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/ml/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/mr/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/ms/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/my/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/ne/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/nl/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/oc/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/or/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/pa/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/pl/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/pt/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/rm/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/ro/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/ru/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/si/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/sk/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/sl/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/sq/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/sr/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/sv-SE/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/ta/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/te/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/th/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/tl/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/tr/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/uk/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/ur/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/uz/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/vi/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/wo/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/zh-CN/messages.json delete mode 100644 browser/components/search/extensions/wikipedia/_locales/zh-TW/messages.json create mode 100644 browser/components/search/extensions/yahoo/favicon.ico create mode 100644 browser/components/search/extensions/yahoo/manifest.json create mode 100644 browser/components/search/extensions/youtube/favicon.ico create mode 100644 browser/components/search/extensions/youtube/manifest.json diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index fe5c5a90d8715..89f81f58b1f60 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -250,13 +250,15 @@ pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed- // Putting the search engine prefs into this file to fix #11236. // Default search engine -pref("browser.search.defaultenginename", "Search"); +pref("browser.search.defaultenginename", "data:text/plain,browser.search.defaultenginename=DuckDuckGo"); +// Make sure we use the same search engine regardless of locale +pref("browser.search.geoSpecificDefaults", false); // Search engine order (order displayed in the search bar dropdown) // Somewhat surprisingly we get some random behavior if we specify more than // two search engines as below. See // https://bugzilla.mozilla.org/show_bug.cgi?id=1126722 for details. -pref("browser.search.order.extra.1", "Search"); +pref("browser.search.order.extra.1", "DuckDuckGo"); pref("browser.search.order.extra.2", "YouTube"); // Enforce certificate pinning, see: https://bugs.torproject.org/16206 diff --git a/browser/components/search/extensions/ddg-onion/favicon.ico b/browser/components/search/extensions/ddg-onion/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..13c325f6585f6f39107e470b70674eb16352c14e GIT binary patch literal 973 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 diff --git a/browser/components/search/extensions/ddg/favicon.png b/browser/components/search/extensions/ddg/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..c853b95b89efdd171e24c5b59929e686e6812016 GIT binary patch literal 1150 zcmaKrJxCl;5XaxCXcIp`5DUQ*@gfR#A`y(0m6F0HiKID<7!gAX30jEP2%-?MveQVa zU}-EQpm!<}1yMvXMM&qz;ohoA-19zm|IWO-eZIw<@0i`kf95yyZr-dAKKhlF33~d) zy8FR`7rq(Kag2N z-{xS%4e(msG|@Q|0_kj4HpZvtA&uE(G8xyqGm8GLKD=7%LNM|XJ&|sgci$YVa?qaZ zx;{+qe?~MOmGxh|{H@nlG0gB8=p7*Ab4g!wQw)wHQTb?VF{NHtAJbXhGs7(RMfrkn zt`!_h1C>)2iZ)Ux+)m@kVgj|#E>$dX<7C`hrG1*dQGDw!8^u4;sCs>ky2c0fnPK)+ z=fAHc6#xFjLBWBYv3(mQ3klRb_ta=2@6MId_I6XMw!4{}xKV!nztVo3jPF3*Uq`!%#jm$8O&e#YHpWK( zp`rG^zZx&^FFONje%8ZDa1VYSr!g}8H&A rnbjBhxF0-|?riY=x_y4|{oYm!aaAfrI6q?{&iudZq_NM9V}{u~D@ZQX literal 0 HcmV?d00001 diff --git a/browser/components/search/extensions/ddg/manifest.json b/browser/components/search/extensions/ddg/manifest.json index b15330b16bf5c..77400611ee205 100644 --- a/browser/components/search/extensions/ddg/manifest.json +++ b/browser/components/search/extensions/ddg/manifest.json @@ -10,51 +10,19 @@ }, "hidden": true, "icons": { - "16": "favicon.ico" + "16": "favicon.png" }, "web_accessible_resources": [ - "favicon.ico" + "favicon.png" ], "chrome_settings_overrides": { "search_provider": { "name": "DuckDuckGo", - "search_url": "https://duckduckgo.com/", - "search_form": "https://duckduckgo.com/?q={searchTerms}", - "search_url_get_params": "q={searchTerms}", - "params": [ - { - "name": "t", - "condition": "purpose", - "purpose": "contextmenu", - "value": "ffcm" - }, - { - "name": "t", - "condition": "purpose", - "purpose": "keyword", - "value": "ffab" - }, - { - "name": "t", - "condition": "purpose", - "purpose": "searchbar", - "value": "ffsb" - }, - { - "name": "t", - "condition": "purpose", - "purpose": "homepage", - "value": "ffhp" - }, - { - "name": "t", - "condition": "purpose", - "purpose": "newtab", - "value": "ffnt" - } - ], + "search_url": "https://duckduckgo.com", + "search_form": "https://duckduckgo.com", + "search_url_post_params": "q={searchTerms}", "suggest_url": "https://ac.duckduckgo.com/ac/", "suggest_url_get_params": "q={searchTerms}&type=list" } } -} \ No newline at end of file +} diff --git a/browser/components/search/extensions/google/_locales/b-1-d/messages.json b/browser/components/search/extensions/google/_locales/b-1-d/messages.json deleted file mode 100644 index 1b9d05307d64e..0000000000000 --- a/browser/components/search/extensions/google/_locales/b-1-d/messages.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "extensionName": { - "message": "Google" - }, - "extensionDescription": { - "message": "Google Search" - }, - "searchUrl": { - "message": "https://www.google.com/search" - }, - "searchForm": { - "message": "https://www.google.com/search?client=firefox-b-1-d&q={searchTerms}" - }, - "suggestUrl": { - "message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}" - }, - "searchUrlGetParams": { - "message": "client=firefox-b-1-d&q={searchTerms}" - }, - "channelPref": { - "message": "google_channel_us" - } -} diff --git a/browser/components/search/extensions/google/_locales/b-1-e/messages.json b/browser/components/search/extensions/google/_locales/b-1-e/messages.json deleted file mode 100644 index b470cd8443316..0000000000000 --- a/browser/components/search/extensions/google/_locales/b-1-e/messages.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "extensionName": { - "message": "Google" - }, - "extensionDescription": { - "message": "Google Search" - }, - "searchUrl": { - "message": "https://www.google.com/search" - }, - "searchForm": { - "message": "https://www.google.com/search?client=firefox-b-1-e&q={searchTerms}" - }, - "suggestUrl": { - "message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}" - }, - "searchUrlGetParams": { - "message": "client=firefox-b-1-e&q={searchTerms}" - }, - "channelPref": { - "message": "google_channel_us" - } -} diff --git a/browser/components/search/extensions/google/_locales/b-d/messages.json b/browser/components/search/extensions/google/_locales/b-d/messages.json deleted file mode 100644 index a6423089d9f9c..0000000000000 --- a/browser/components/search/extensions/google/_locales/b-d/messages.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "extensionName": { - "message": "Google" - }, - "extensionDescription": { - "message": "Google Search" - }, - "searchUrl": { - "message": "https://www.google.com/search" - }, - "searchForm": { - "message": "https://www.google.com/search?client=firefox-b-d&q={searchTerms}" - }, - "suggestUrl": { - "message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}" - }, - "searchUrlGetParams": { - "message": "client=firefox-b-d&q={searchTerms}" - }, - "channelPref": { - "message": "google_channel_row" - } -} diff --git a/browser/components/search/extensions/google/_locales/b-e/messages.json b/browser/components/search/extensions/google/_locales/b-e/messages.json deleted file mode 100644 index 70939ee000743..0000000000000 --- a/browser/components/search/extensions/google/_locales/b-e/messages.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "extensionName": { - "message": "Google" - }, - "extensionDescription": { - "message": "Google Search" - }, - "searchUrl": { - "message": "https://www.google.com/search" - }, - "searchForm": { - "message": "https://www.google.com/search?client=firefox-b-e&q={searchTerms}" - }, - "suggestUrl": { - "message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}" - }, - "searchUrlGetParams": { - "message": "client=firefox-b-e&q={searchTerms}" - }, - "channelPref": { - "message": "google_channel_row" - } -} diff --git a/browser/components/search/extensions/google/_locales/en/messages.json b/browser/components/search/extensions/google/_locales/en/messages.json deleted file mode 100644 index aeca0ef128b3c..0000000000000 --- a/browser/components/search/extensions/google/_locales/en/messages.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "extensionName": { - "message": "Google" - }, - "extensionDescription": { - "message": "Google Search" - }, - "searchUrl": { - "message": "https://www.google.com/search" - }, - "searchForm": { - "message": "https://www.google.com/search?client=firefox-b-d&q={searchTerms}" - }, - "suggestUrl": { - "message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}" - }, - "searchUrlGetParams": { - "message": "client=firefox-b-d&q={searchTerms}" - }, - "channelPref": { - "message": "google_channel_row" - } - -} diff --git a/browser/components/search/extensions/google/manifest.json b/browser/components/search/extensions/google/manifest.json index 72ffd5698321d..b62de30cb7faf 100644 --- a/browser/components/search/extensions/google/manifest.json +++ b/browser/components/search/extensions/google/manifest.json @@ -1,6 +1,6 @@ { - "name": "__MSG_extensionName__", - "description": "__MSG_extensionDescription__", + "name": "Google", + "description": "Google Search", "manifest_version": 2, "version": "1.0", "applications": { @@ -9,7 +9,6 @@ } }, "hidden": true, - "default_locale": "en", "icons": { "16": "favicon.ico" }, @@ -18,18 +17,18 @@ ], "chrome_settings_overrides": { "search_provider": { - "name": "__MSG_extensionName__", - "search_url": "__MSG_searchUrl__", - "search_form": "__MSG_searchForm__", - "suggest_url": "__MSG_suggestUrl__", + "name": "Google", + "search_url": "https://www.google.com/search", + "search_form": "https://www.google.com/search?client=firefox-b-d&q={searchTerms}", + "suggest_url": "https://www.google.com/complete/search?client=firefox&q={searchTerms}", "params": [ { "name": "channel", "condition": "pref", - "pref": "__MSG_channel_pref__" + "pref": "google_channel_row" } ], - "search_url_get_params": "__MSG_searchUrlGetParams__" + "search_url_get_params": "client=firefox-b-d&q={searchTerms}" } } } diff --git a/browser/components/search/extensions/list.json b/browser/components/search/extensions/list.json index d023e0a0e55f1..84428869d6276 100644 --- a/browser/components/search/extensions/list.json +++ b/browser/components/search/extensions/list.json @@ -1,86 +1,20 @@ { "default": { - "searchDefault": "Google", - "searchOrder": ["Google", "Bing"], + "searchDefault": "DuckDuckGo", + "searchOrder": ["DuckDuckGo", "YouTube", "Google"], "visibleDefaultEngines": [ - "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] }, "regionOverrides": { - "US": { - "google-b-d": "google-b-1-d" - }, - "CA": { - "ebay": "ebay-ca", - "ebay-fr": "ebay-ca", - "amazondotcom": "amazon-ca", - "amazon-france": "amazon-ca" - }, - "AT": { - "ebay-de": "ebay-at" - }, - "AU": { - "ebay": "ebay-au", - "ebay-uk": "ebay-au", - "amazondotcom": "amazon-au", - "amazon-en-GB": "amazon-au" - }, - "BE": { - "ebay": "ebay-be", - "ebay-nl": "ebay-be", - "ebay-fr": "ebay-be" - }, - "CH": { - "ebay": "ebay-ch", - "ebay-de": "ebay-ch", - "ebay-fr": "ebay-ch" - }, - "FR": { - "amazondotcom": "amazon-france" - }, - "IE": { - "ebay": "ebay-ie", - "ebay-uk": "ebay-ie" - }, - "NL": { - "ebay": "ebay-nl" - }, - "GB": { - "ebay": "ebay-uk", - "amazondotcom": "amazon-en-GB" - } }, "locales": { "en-US": { "default": { "visibleDefaultEngines": [ - "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] }, - "KZ": { - "visibleDefaultEngines": [ - "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" - ], - "searchDefault": "Yandex" - }, - "BY": { - "visibleDefaultEngines": [ - "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" - ], - "searchDefault": "Yandex" - }, - "RU": { - "visibleDefaultEngines": [ - "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" - ], - "searchDefault": "Yandex" - }, - "TR": { - "visibleDefaultEngines": [ - "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" - ], - "searchDefault": "Yandex" - }, "experimental-hidden": { "visibleDefaultEngines": [ "amazon-ca", "amazon-au", "yandex-en", "google", "google-b-1-e", "google-b-e" @@ -111,7 +45,7 @@ "ar": { "default": { "visibleDefaultEngines": [ - "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ar" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -200,7 +134,7 @@ "ca": { "default": { "visibleDefaultEngines": [ - "google-b-d", "bing", "diec2", "ddg", "ebay-es", "twitter", "wikipedia-ca" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -220,9 +154,8 @@ }, "cs": { "default": { - "searchOrder": ["Google", "Seznam"], "visibleDefaultEngines": [ - "google-b-d", "seznam-cz", "ddg", "heureka-cz", "mapy-cz", "wikipedia-cz" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -236,14 +169,14 @@ "da": { "default": { "visibleDefaultEngines": [ - "google-b-d", "bing", "amazon-en-GB", "ddg", "wikipedia-da" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "de": { "default": { "visibleDefaultEngines": [ - "google-b-d", "amazon-de", "bing", "ddg", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -257,7 +190,7 @@ "el": { "default": { "visibleDefaultEngines": [ - "google-b-d", "amazon-en-GB", "bing", "ddg", "wikipedia-el" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -374,7 +307,7 @@ "es-AR": { "default": { "visibleDefaultEngines": [ - "google-b-d", "amazondotcom", "drae", "ddg", "mercadolibre-ar", "wikipedia-es" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -388,7 +321,7 @@ "es-ES": { "default": { "visibleDefaultEngines": [ - "google-b-d", "bing", "drae", "ddg", "ebay-es", "twitter", "wikipedia-es" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -421,7 +354,7 @@ "fa": { "default": { "visibleDefaultEngines": [ - "google-b-d", "amazondotcom", "bing", "ddg", "wikipedia-fa" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -442,7 +375,7 @@ "fr": { "default": { "visibleDefaultEngines": [ - "google-b-d", "bing", "amazon-france", "ddg", "ebay-fr", "qwant", "wikipedia-fr" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -461,7 +394,7 @@ "ga-IE": { "default": { "visibleDefaultEngines": [ - "google-b-d", "amazon-en-GB", "ddg", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -496,7 +429,7 @@ "he": { "default": { "visibleDefaultEngines": [ - "google-b-d", "ddg", "wikipedia-he", "morfix-dic" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -524,7 +457,7 @@ "hu": { "default": { "visibleDefaultEngines": [ - "google-b-d", "ddg", "vatera", "wikipedia-hu" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -545,44 +478,42 @@ "id": { "default": { "visibleDefaultEngines": [ - "google-b-d", "ddg", "wikipedia-id" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "is": { "default": { "visibleDefaultEngines": [ - "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-is" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "it": { "default": { "visibleDefaultEngines": [ - "google-b-d", "bing", "amazon-it", "ddg", "ebay-it", "wikipedia-it" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "ja-JP-macos": { "default": { - "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Twitter", "Wikipedia (ja)"], "visibleDefaultEngines": [ - "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "ja": { "default": { - "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Twitter", "Wikipedia (ja)"], "visibleDefaultEngines": [ - "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "ka": { "default": { "visibleDefaultEngines": [ - "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ka" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -629,7 +560,7 @@ "ko": { "default": { "visibleDefaultEngines": [ - "google-b-d", "ddg", "naver-kr", "daum-kr", "wikipedia-kr" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -678,7 +609,7 @@ "mk": { "default": { "visibleDefaultEngines": [ - "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-mk" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -713,7 +644,7 @@ "nb-NO": { "default": { "visibleDefaultEngines": [ - "google-b-d", "amazon-en-GB", "bing", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -727,7 +658,7 @@ "nl": { "default": { "visibleDefaultEngines": [ - "google-b-d", "bing", "bolcom-nl", "ddg", "ebay-nl", "marktplaats-nl", "wikipedia-nl" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] }, "experimental-hidden": { @@ -767,14 +698,14 @@ "pl": { "default": { "visibleDefaultEngines": [ - "google-b-d", "allegro-pl", "ddg", "pwn-pl", "wikipedia-pl", "wolnelektury-pl" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "pt-BR": { "default": { "visibleDefaultEngines": [ - "google-b-d", "bing", "ddg", "mercadolivre", "twitter", "wikipedia-pt" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -795,14 +726,14 @@ "ro": { "default": { "visibleDefaultEngines": [ - "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ro" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "ru": { "default": { "visibleDefaultEngines": [ - "yandex-ru", "google-b-d", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] }, "RU": { @@ -863,7 +794,7 @@ "sv-SE": { "default": { "visibleDefaultEngines": [ - "google-b-d", "bing", "allaannonser-sv-SE", "ddg", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -898,7 +829,7 @@ "tr": { "default": { "visibleDefaultEngines": [ - "yandex-tr", "google-b-d", "ddg", "twitter", "wikipedia-tr" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] }, "TR": { @@ -945,7 +876,7 @@ "vi": { "default": { "visibleDefaultEngines": [ - "google-b-d", "coccoc", "ddg", "wikipedia-vi" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -966,7 +897,7 @@ "zh-CN": { "default": { "visibleDefaultEngines": [ - "baidu", "google-b-d", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] }, "CN": { @@ -976,7 +907,7 @@ "zh-TW": { "default": { "visibleDefaultEngines": [ - "google-b-d", "ddg", "readmoo", "wikipedia-zh-TW" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } } diff --git a/browser/components/search/extensions/startpage/favicon.png b/browser/components/search/extensions/startpage/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..44b94a986fd2e5608b5d646df30685cefedd5a0a GIT binary patch literal 1150 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 WGdFyeGA~iKT{_bJ?tbvU-v1ZC%IvBD literal 0 HcmV?d00001 diff --git a/browser/components/search/extensions/yahoo/manifest.json b/browser/components/search/extensions/yahoo/manifest.json new file mode 100644 index 0000000000000..e1f04a373c2ea --- /dev/null +++ b/browser/components/search/extensions/yahoo/manifest.json @@ -0,0 +1,28 @@ +{ + "name": "Yahoo", + "description": "Yahoo Search", + "manifest_version": 2, + "version": "1.0", + "applications": { + "gecko": { + "id": "yahoo@search.mozilla.org" + } + }, + "hidden": true, + "icons": { + "16": "favicon.ico" + }, + "web_accessible_resources": [ + "favicon.ico" + ], + "chrome_settings_overrides": { + "search_provider": { + "name": "Yahoo", + "search_url": "https://search.yahoo.com/yhs/search", + "search_form": "https://search.yahoo.com/yhs/search?p={searchTerms}&ei=UTF-8&hspart=mozilla", + "search_url_get_params": "p={searchTerms}&ei=UTF-8&hspart=mozilla", + "suggest_url": "https://search.yahoo.com/sugg/ff", + "suggest_url_get_params": "output=fxjson&appid=ffd&command={searchTerms}" + } + } +} diff --git a/browser/components/search/extensions/youtube/favicon.ico b/browser/components/search/extensions/youtube/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..977887dbbb8407afcc5c1a9c42109560826fd1a7 GIT binary patch literal 1150 zcmd7Rze@sP7zglI=*Qhzc5100Qe%q{^bhneL~GE{($>;H5CqpyK|^7Q4Vps{I7vg0 z1`S5HR0u&hpSXxFaUgvAo_FY-5|NYd@p<3(p6B}vH=GbYKB_9XFNvKAAtFMEWnzgH zyUs(bu^0B+toLzP((I{BS<)Tg`I}Ey?tu3xDR8C{Mx@Ds3!UI~j!9_~(#-xqeK2Ru zUNwlhzHl^yO63*n8;6)y_Sj2%`mSt4p1bZ4+!o?FRIAmlqvJcM^Sk`MlqcilIeW{x zS0sLeTCLVoD(OhBoDAixIYliDi6#m#45O!BuOoH&F_g1siycKRvey?&6wzw6y4vkF z(wQ%WV)vemlkX_OhX%ndw)hCsG|_B+V{7}(({tzS*|M$#%gpqt(I@2c29m2Up1M2Z m+;xBOStE={^M@)jg?6m~ literal 0 HcmV?d00001 diff --git a/browser/components/search/extensions/youtube/manifest.json b/browser/components/search/extensions/youtube/manifest.json new file mode 100644 index 0000000000000..6fbf8745bac2a --- /dev/null +++ b/browser/components/search/extensions/youtube/manifest.json @@ -0,0 +1,26 @@ +{ + "name": "YouTube", + "description": "YouTube - Videos", + "manifest_version": 2, + "version": "1.0", + "applications": { + "gecko": { + "id": "youtube@search.mozilla.org" + } + }, + "hidden": true, + "icons": { + "16": "favicon.ico" + }, + "web_accessible_resources": [ + "favicon.ico" + ], + "chrome_settings_overrides": { + "search_provider": { + "name": "YouTube", + "search_url": "https://www.youtube.com/results?search_query={searchTerms}&search=Search", + "search_form": "https://www.youtube.com/index", + "suggest_url": "https://suggestqueries.google.com/complete/search?output=firefox&ds=yt&q={searchTerms}" + } + } +} \ No newline at end of file -- GitLab