Skip to content

GitLab

T
tangled
Commit 0a494d9f authored by Pavel Yatsuk's avatar Pavel Yatsuk Committed by Commit Bot
Browse files
Options

Add search engines from search engine choice data into prepopulated list 

BUG=1033590
TBR=gambard@chromium.org

Change-Id: I62d7d7ea2a35415cb787692c6afa5c7990f5157e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1965971
Commit-Queue: Pavel Yatsuk <pavely@chromium.org>
Reviewed-by: default avatarJustin Donnelly <jdonnelly@chromium.org>
Reviewed-by: default avatarPeter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726930}
parent dabaa28e
Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 6 deletions
components/search_engines/prepopulated_engines.json
View file @ 0a494d9f
......@@ -23,7 +23,7 @@
// When adding new engines, increment this number and use it as the new
// max ID. This is used by UMA stats and must be updated to include the full
// range or else not all engines will be counted in stats.
"kMaxPrepopulatedEngineID": 94,
"kMaxPrepopulatedEngineID": 100,
// Increment this if you change the data in ways that mean users with
// existing data should get a new version. Otherwise, existing data may
......@@ -156,12 +156,22 @@
"id": 94
},
"seznam": {
"seznam_cz": {
"name": "Seznam",
"keyword": "seznam.cz",
"favicon_url": "https://search.seznam.cz/r/img/favicon.ico",
"favicon_url": "https://search.seznam.cz/favicon.ico",
"search_url": "https://search.seznam.cz/?q={searchTerms}",
"suggest_url": "https://suggest.fulltext.seznam.cz/fulltext_ff?phrase={searchTerms}",
"suggest_url": "https://suggest.seznam.cz/fulltext_ff?phrase={searchTerms}",
"type": "SEARCH_ENGINE_SEZNAM",
"id": 25
},
"seznam_sk": {
"name": "Seznam",
"keyword": "seznam.sk",
"favicon_url": "https://search.seznam.sk/favicon.ico",
"search_url": "https://search.seznam.sk/?q={searchTerms}",
"suggest_url": "https://suggest.seznam.sk/fulltext_ff?phrase={searchTerms}",
"type": "SEARCH_ENGINE_SEZNAM",
"id": 25
},
......@@ -732,6 +742,76 @@
"id": 60
},
"givero": {
"name": "Givero",
"keyword": "givero.com",
"favicon_url": "https://www.givero.com/favicon.ico",
"search_url": "https://www.givero.com/search?q={searchTerms}",
"suggest_url": "https://www.givero.com/suggest?q={searchTerms}",
"type": "SEARCH_ENGINE_GIVERO",
"id": 95
},
"gmx": {
"name": "GMX Search",
"keyword": "search.gmx.com",
"favicon_url": "https://dl.gmx.com/apps/favicon.ico",
"search_url": "https://search.gmx.com/web/result?q={searchTerms}&sp=b",
"suggest_url": "https://suggestplugin.gmx.com/s?q={searchTerms}&brand=gmxcom&enc={inputEncoding}&sp=b",
"type": "SEARCH_ENGINE_GMX",
"id": 96
},
"gmx_at": {
"name": "GMX Suche",
"keyword": "suche.gmx.at",
"favicon_url": "https://dl.gmx.com/apps/favicon.ico",
"search_url": "https://suche.gmx.at/web/result?q={searchTerms}&sp=b",
"suggest_url": "https://suggestplugin.gmx.at/s?q={searchTerms}&brand=gmxat&enc={inputEncoding}&sp=b",
"type": "SEARCH_ENGINE_GMX",
"id": 96
},
"gmx_de": {
"name": "GMX Suche",
"keyword": "suche.gmx.net",
"favicon_url": "https://dl.gmx.com/apps/favicon.ico",
"search_url": "https://suche.gmx.net/web/result?q={searchTerms}&sp=b",
"suggest_url": "https://suggestplugin.gmx.net/s?q={searchTerms}&brand=gmx&enc={inputEncoding}&sp=b",
"type": "SEARCH_ENGINE_GMX",
"id": 96
},
"gmx_es": {
"name": "GMX Search",
"keyword": "search.gmx.es",
"favicon_url": "https://dl.gmx.com/apps/favicon.ico",
"search_url": "https://search.gmx.es/web/result?q={searchTerms}&sp=b",
"suggest_url": "https://suggestplugin.gmx.es/s?q={searchTerms}&brand=gmxes&enc={inputEncoding}&sp=b",
"type": "SEARCH_ENGINE_GMX",
"id": 96
},
"gmx_fr": {
"name": "GMX Search",
"keyword": "search.gmx.fr",
"favicon_url": "https://dl.gmx.com/apps/favicon.ico",
"search_url": "https://search.gmx.fr/web/result?q={searchTerms}&sp=b",
"suggest_url": "https://suggestplugin.gmx.fr/s?q={searchTerms}&brand=gmxfr&enc={inputEncoding}&sp=b",
"type": "SEARCH_ENGINE_GMX",
"id": 96
},
"gmx_gb": {
"name": "GMX Search",
"keyword": "search.gmx.co.uk",
"favicon_url": "https://dl.gmx.com/apps/favicon.ico",
"search_url": "https://search.gmx.co.uk/web/result?q={searchTerms}&sp=b",
"suggest_url": "https://suggestplugin.gmx.co.uk/s?q={searchTerms}&brand=gmxcouk&enc={inputEncoding}&sp=b",
"type": "SEARCH_ENGINE_GMX",
"id": 96
},
"goo": {
"name": "goo",
"keyword": "search.goo.ne.jp",
......@@ -793,6 +873,15 @@
"id": 74
},
"info_com": {
"name": "Info.com",
"keyword": "info.com",
"favicon_url": "https://www.info.com/static/www.info.com/favicon.ico",
"search_url": "https://www.info.com/serp?q={searchTerms}&segment=info.0472",
"type": "SEARCH_ENGINE_INFO_COM",
"id": 97
},
"libero": {
"name": "Libero",
"keyword": "libero.it",
......@@ -803,6 +892,24 @@
"id": 63
},
"metager_de": {
"name": "MetaGer",
"keyword": "metager.de",
"favicon_url": "https://metager.de/favicon.ico",
"search_url": "https://metager.de/meta/meta.ger3?eingabe={searchTerms}",
"type": "SEARCH_ENGINE_METAGER",
"id": 98
},
"metager_gb": {
"name": "MetaGer",
"keyword": "metager.org",
"favicon_url": "https://metager.de/favicon.ico",
"search_url": "https://metager.org/meta/meta.ger3?eingabe={searchTerms}",
"type": "SEARCH_ENGINE_METAGER",
"id": 98
},
"neti": {
"name": "NETI",
"keyword": "neti.ee",
......@@ -828,6 +935,16 @@
"id": 43
},
"oceanhero":{
"name": "OceanHero",
"keyword": "oceanhero.today",
"favicon_url": "https://oceanhero.today/favicon.ico",
"search_url": "https://oceanhero.today/web?q={searchTerms}",
"suggest_url": "https://api.oceanhero.today/suggestions?q={searchTerms}",
"type": "SEARCH_ENGINE_OCEANHERO",
"id": 99
},
"ok": {
"name": "OK.hu",
"keyword": "ok.hu",
......@@ -838,6 +955,16 @@
"id": 6
},
"privacywall": {
"name": "PrivacyWall",
"keyword": "privacywall.org",
"favicon_url": "https://www.privacywall.org/images/favicon32.ico",
"search_url": "https://www.privacywall.org/search/secure/?q={searchTerms}",
"suggest_url": "https://www.privacywall.org/search/suggest.php?q={searchTerms}",
"type": "SEARCH_ENGINE_PRIVACYWALL",
"id": 100
},
"rambler": {
"name": "\u0420\u0430\u043c\u0431\u043b\u0435\u0440",
"keyword": "rambler.ru",
......
components/search_engines/search_engine_type.h
View file @ 0a494d9f
......@@ -67,6 +67,12 @@ enum SearchEngineType {
SEARCH_ENGINE_DUCKDUCKGO,
SEARCH_ENGINE_PARSIJOO,
SEARCH_ENGINE_QWANT,
SEARCH_ENGINE_GIVERO,
SEARCH_ENGINE_GMX,
SEARCH_ENGINE_INFO_COM,
SEARCH_ENGINE_METAGER,
SEARCH_ENGINE_OCEANHERO,
SEARCH_ENGINE_PRIVACYWALL,
SEARCH_ENGINE_MAX // Bounding value needed for UMA histogram macro.
};
......
components/search_engines/template_url_prepopulate_data.cc
View file @ 0a494d9f
......@@ -204,7 +204,7 @@ const PrepopulatedEngine* const engines_CR[] = {
// Czech Republic
const PrepopulatedEngine* const engines_CZ[] = {
&google,
&seznam,
&seznam_cz,
&bing,
&yahoo,
};
......
ios/chrome/browser/ui/settings/search_engine_table_view_controller_unittest.mm
View file @ 0a494d9f
......@@ -346,7 +346,12 @@ TEST_F(SearchEngineTableViewControllerTest, TestUrlModifiedByService) {
// Tests that when user change default search engine, all items can be displayed
// correctly and the change can be synced to the prefs.
TEST_F(SearchEngineTableViewControllerTest, TestChangeProvider) {
// TODO(crbug.com/1036445): When selecting prepopulated search engines the test
// relies on the assumption that setting search engine as default will leave it
// intact. The actual behavior is that if search engine's prepopulated id
// matches the one from the record in search engines table then the later one
// will be used.
TEST_F(SearchEngineTableViewControllerTest, DISABLED_TestChangeProvider) {
// This test also needs to test the UMA, so load some real prepopulated search
// engines to ensure the SearchEngineType is logged correctly. Don't use any
// literal symbol(e.g. "google" or "AOL") from
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment