From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Thu, 12 Oct 2017 11:06:18 +0200 Subject: Add DuckDuckGo Lite search engine --- .../search_engines/prepopulated_engines.json | 10 + .../search_engines/search_engine_type.h | 1 + .../template_url_prepopulate_data.cc | 190 +++++++++--------- 3 files changed, 107 insertions(+), 94 deletions(-) diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json --- a/components/search_engines/prepopulated_engines.json +++ b/components/search_engines/prepopulated_engines.json @@ -91,6 +91,16 @@ "id": 68 }, + "duckduckgo_light": { + "name": "DuckDuckGo Light", + "keyword": "duckduckgo.com/lite", + "favicon_url": "https://duckduckgo.com/favicon.ico", + "search_url": "https://duckduckgo.com/lite/?q={searchTerms}", + "suggest_url": "https://duckduckgo.com/ac/?q={searchTerms}&type=list", + "type": "SEARCH_ENGINE_DUCKDUCKGOLIGHT", + "id": 12 + }, + "duckduckgo": { "name": "DuckDuckGo", "keyword": "duckduckgo.com", diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h --- a/components/search_engines/search_engine_type.h +++ b/components/search_engines/search_engine_type.h @@ -65,6 +65,7 @@ enum SearchEngineType { SEARCH_ENGINE_360, SEARCH_ENGINE_COCCOC, SEARCH_ENGINE_DUCKDUCKGO, + SEARCH_ENGINE_DUCKDUCKGOLIGHT, SEARCH_ENGINE_PARSIJOO, SEARCH_ENGINE_QWANT, SEARCH_ENGINE_GIVERO, diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc --- a/components/search_engines/template_url_prepopulate_data.cc +++ b/components/search_engines/template_url_prepopulate_data.cc @@ -35,6 +35,7 @@ const PrepopulatedEngine* const engines_default[] = { &googleen, &google, &bing, &yahoo, + &duckduckgo, &duckduckgo_light, }; // Note, the below entries are sorted by country code, not the name in comment. @@ -44,7 +45,7 @@ const PrepopulatedEngine* const engines_AE[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yandex_ru, }; @@ -53,7 +54,7 @@ const PrepopulatedEngine* const engines_AL[] = { &googleen, &google, &yahoo, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yandex_ru, }; @@ -62,7 +63,7 @@ const PrepopulatedEngine* const engines_AR[] = { &googleen, &google, &bing, &yahoo_ar, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -70,7 +71,7 @@ const PrepopulatedEngine* const engines_AR[] = { const PrepopulatedEngine* const engines_AT[] = { &googleen, &google, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yahoo_at, &ecosia, }; @@ -79,7 +80,7 @@ const PrepopulatedEngine* const engines_AT[] = { const PrepopulatedEngine* const engines_AU[] = { &googleen, &google, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yahoo_au, &ecosia, }; @@ -89,7 +90,7 @@ const PrepopulatedEngine* const engines_BA[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ask, }; @@ -99,7 +100,7 @@ const PrepopulatedEngine* const engines_BE[] = { &bing, &yahoo, &ecosia, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Bulgaria @@ -107,7 +108,7 @@ const PrepopulatedEngine* const engines_BG[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yandex_ru, }; @@ -116,7 +117,7 @@ const PrepopulatedEngine* const engines_BH[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -125,7 +126,7 @@ const PrepopulatedEngine* const engines_BI[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ask, }; @@ -134,7 +135,7 @@ const PrepopulatedEngine* const engines_BN[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -143,7 +144,7 @@ const PrepopulatedEngine* const engines_BO[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -152,7 +153,7 @@ const PrepopulatedEngine* const engines_BR[] = { &googleen, &google, &bing, &yahoo_br, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -170,7 +171,7 @@ const PrepopulatedEngine* const engines_BZ[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ask, }; @@ -179,7 +180,7 @@ const PrepopulatedEngine* const engines_CA[] = { &googleen, &google, &bing, &yahoo_ca, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -187,7 +188,7 @@ const PrepopulatedEngine* const engines_CA[] = { const PrepopulatedEngine* const engines_CH[] = { &googleen, &google, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yahoo_ch, &ecosia, }; @@ -197,7 +198,7 @@ const PrepopulatedEngine* const engines_CL[] = { &googleen, &google, &bing, &yahoo_cl, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -216,7 +217,7 @@ const PrepopulatedEngine* const engines_CO[] = { &bing, &yahoo_co, &ecosia, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Costa Rica @@ -224,7 +225,7 @@ const PrepopulatedEngine* const engines_CR[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -234,7 +235,7 @@ const PrepopulatedEngine* const engines_CZ[] = { &seznam_cz, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Germany @@ -242,7 +243,7 @@ const PrepopulatedEngine* const engines_DE[] = { &googleen, &google, &bing, &yahoo_de, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -251,7 +252,7 @@ const PrepopulatedEngine* const engines_DK[] = { &googleen, &google, &bing, &yahoo_dk, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -260,7 +261,7 @@ const PrepopulatedEngine* const engines_DO[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -270,7 +271,7 @@ const PrepopulatedEngine* const engines_DZ[] = { &yahoo, &bing, &yandex_ru, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Ecuador @@ -279,7 +280,7 @@ const PrepopulatedEngine* const engines_EC[] = { &bing, &yahoo, &ecosia, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Estonia @@ -297,7 +298,7 @@ const PrepopulatedEngine* const engines_EG[] = { &yahoo, &bing, &yandex_ru, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Spain @@ -305,7 +306,7 @@ const PrepopulatedEngine* const engines_ES[] = { &googleen, &google, &bing, &yahoo_es, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -314,7 +315,7 @@ const PrepopulatedEngine* const engines_FI[] = { &googleen, &google, &bing, &yahoo_fi, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yandex_ru, }; @@ -323,7 +324,7 @@ const PrepopulatedEngine* const engines_FO[] = { &googleen, &google, &bing, &yahoo_dk, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -341,7 +342,7 @@ const PrepopulatedEngine* const engines_GB[] = { &googleen, &google, &bing, &yahoo_uk, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -350,7 +351,7 @@ const PrepopulatedEngine* const engines_GR[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yandex_ru, }; @@ -360,7 +361,7 @@ const PrepopulatedEngine* const engines_GT[] = { &bing, &yahoo, &ecosia, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Hong Kong @@ -378,7 +379,7 @@ const PrepopulatedEngine* const engines_HN[] = { &bing, &yahoo, &yandex_ru, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Croatia @@ -386,7 +387,7 @@ const PrepopulatedEngine* const engines_HR[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -395,7 +396,7 @@ const PrepopulatedEngine* const engines_HU[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -404,7 +405,7 @@ const PrepopulatedEngine* const engines_ID[] = { &googleen, &google, &yahoo_id, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yandex_com, }; @@ -413,7 +414,7 @@ const PrepopulatedEngine* const engines_IE[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -423,7 +424,7 @@ const PrepopulatedEngine* const engines_IL[] = { &bing, &yahoo, &yandex_ru, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // India @@ -431,7 +432,7 @@ const PrepopulatedEngine* const engines_IN[] = { &googleen, &google, &yahoo_in, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yandex_ru, }; @@ -441,7 +442,7 @@ const PrepopulatedEngine* const engines_IQ[] = { &yahoo, &bing, &yandex_ru, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Iran @@ -457,7 +458,7 @@ const PrepopulatedEngine* const engines_IR[] = { const PrepopulatedEngine* const engines_IS[] = { &googleen, &google, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yahoo, &ecosia, }; @@ -467,7 +468,7 @@ const PrepopulatedEngine* const engines_IT[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -476,7 +477,7 @@ const PrepopulatedEngine* const engines_JM[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ask, }; @@ -485,7 +486,7 @@ const PrepopulatedEngine* const engines_JO[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yandex_com, }; @@ -495,7 +496,7 @@ const PrepopulatedEngine* const engines_JP[] = { &yahoo_jp, &bing, &baidu, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Kenya @@ -503,7 +504,7 @@ const PrepopulatedEngine* const engines_KE[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yandex_ru, }; @@ -521,7 +522,7 @@ const PrepopulatedEngine* const engines_KW[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yandex_com, }; @@ -539,7 +540,7 @@ const PrepopulatedEngine* const engines_LB[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -547,7 +548,7 @@ const PrepopulatedEngine* const engines_LB[] = { const PrepopulatedEngine* const engines_LI[] = { &googleen, &google, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yahoo, &ecosia, }; @@ -558,14 +559,14 @@ const PrepopulatedEngine* const engines_LT[] = { &bing, &yahoo, &yandex_ru, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Luxembourg const PrepopulatedEngine* const engines_LU[] = { &googleen, &google, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yahoo, &ecosia, }; @@ -576,7 +577,7 @@ const PrepopulatedEngine* const engines_LV[] = { &yandex_ru, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Libya @@ -585,7 +586,7 @@ const PrepopulatedEngine* const engines_LY[] = { &yahoo, &bing, &yandex_com, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Morocco @@ -593,7 +594,7 @@ const PrepopulatedEngine* const engines_MA[] = { &googleen, &google, &yahoo, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yandex_com, }; @@ -601,7 +602,7 @@ const PrepopulatedEngine* const engines_MA[] = { const PrepopulatedEngine* const engines_MC[] = { &googleen, &google, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yahoo, &qwant, }; @@ -611,7 +612,7 @@ const PrepopulatedEngine* const engines_MD[] = { &googleen, &google, &yandex_ru, &mail_ru, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &bing, }; @@ -621,7 +622,7 @@ const PrepopulatedEngine* const engines_ME[] = { &bing, &yahoo, &yandex_ru, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Macedonia @@ -629,7 +630,7 @@ const PrepopulatedEngine* const engines_MK[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yandex_ru, }; @@ -639,7 +640,7 @@ const PrepopulatedEngine* const engines_MX[] = { &bing, &yahoo_mx, &ecosia, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Malaysia @@ -647,7 +648,7 @@ const PrepopulatedEngine* const engines_MY[] = { &googleen, &google, &bing, &yahoo_my, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &baidu, }; @@ -656,8 +657,9 @@ const PrepopulatedEngine* const engines_NI[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, + &duckduckgo_light, }; // Netherlands @@ -665,7 +667,7 @@ const PrepopulatedEngine* const engines_NL[] = { &googleen, &google, &bing, &yahoo_nl, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yandex_ru, }; @@ -674,7 +676,7 @@ const PrepopulatedEngine* const engines_NO[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yandex_ru, }; @@ -682,7 +684,7 @@ const PrepopulatedEngine* const engines_NO[] = { const PrepopulatedEngine* const engines_NZ[] = { &googleen, &google, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yahoo_nz, &ecosia, }; @@ -692,7 +694,7 @@ const PrepopulatedEngine* const engines_OM[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -701,7 +703,7 @@ const PrepopulatedEngine* const engines_PA[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -711,7 +713,7 @@ const PrepopulatedEngine* const engines_PE[] = { &bing, &yahoo_pe, &ecosia, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Philippines @@ -720,7 +722,7 @@ const PrepopulatedEngine* const engines_PH[] = { &yahoo_ph, &bing, &ecosia, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Pakistan @@ -728,7 +730,7 @@ const PrepopulatedEngine* const engines_PK[] = { &googleen, &google, &yahoo, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yandex_com, }; @@ -737,7 +739,7 @@ const PrepopulatedEngine* const engines_PL[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yandex_ru, }; @@ -746,7 +748,7 @@ const PrepopulatedEngine* const engines_PR[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -755,7 +757,7 @@ const PrepopulatedEngine* const engines_PT[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -764,7 +766,7 @@ const PrepopulatedEngine* const engines_PY[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -773,7 +775,7 @@ const PrepopulatedEngine* const engines_QA[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yandex_com, }; @@ -782,7 +784,7 @@ const PrepopulatedEngine* const engines_RO[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yandex_ru, }; @@ -791,7 +793,7 @@ const PrepopulatedEngine* const engines_RS[] = { &googleen, &google, &yahoo, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yandex_ru, }; @@ -809,7 +811,7 @@ const PrepopulatedEngine* const engines_RW[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &mail_ru, }; @@ -819,7 +821,7 @@ const PrepopulatedEngine* const engines_SA[] = { &bing, &yahoo, &yandex_com, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Sweden @@ -827,7 +829,7 @@ const PrepopulatedEngine* const engines_SE[] = { &googleen, &google, &bing, &yahoo_se, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -844,7 +846,7 @@ const PrepopulatedEngine* const engines_SG[] = { const PrepopulatedEngine* const engines_SI[] = { &googleen, &google, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yahoo, &yandex_ru, }; @@ -854,7 +856,7 @@ const PrepopulatedEngine* const engines_SK[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &seznam_cz, }; @@ -863,7 +865,7 @@ const PrepopulatedEngine* const engines_SV[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -873,7 +875,7 @@ const PrepopulatedEngine* const engines_SY[] = { &bing, &yahoo, &yandex_ru, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Thailand @@ -881,7 +883,7 @@ const PrepopulatedEngine* const engines_TH[] = { &googleen, &google, &yahoo_th, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &baidu, }; @@ -891,7 +893,7 @@ const PrepopulatedEngine* const engines_TN[] = { &yahoo, &bing, &yandex_ru, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Turkey @@ -900,7 +902,7 @@ const PrepopulatedEngine* const engines_TR[] = { &yandex_tr, &yahoo_tr, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Trinidad and Tobago @@ -908,7 +910,7 @@ const PrepopulatedEngine* const engines_TT[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ask, }; @@ -926,7 +928,7 @@ const PrepopulatedEngine* const engines_TZ[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yandex_ru, }; @@ -944,7 +946,7 @@ const PrepopulatedEngine* const engines_US[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -953,7 +955,7 @@ const PrepopulatedEngine* const engines_UY[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -962,7 +964,7 @@ const PrepopulatedEngine* const engines_VE[] = { &googleen, &google, &yahoo_ve, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &ecosia, }; @@ -981,7 +983,7 @@ const PrepopulatedEngine* const engines_YE[] = { &bing, &yahoo, &yandex_ru, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // South Africa @@ -989,7 +991,7 @@ const PrepopulatedEngine* const engines_ZA[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &baidu, }; @@ -999,7 +1001,7 @@ const PrepopulatedEngine* const engines_ZW[] = { &bing, &yahoo, &ask, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // ---------------------------------------------------------------------------- -- 2.17.1