614 lines
14 KiB
Diff
614 lines
14 KiB
Diff
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 | 122 +++++++++---------
|
|
3 files changed, 75 insertions(+), 58 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,
|
|
};
|
|
|
|
// Albania
|
|
@@ -60,7 +61,7 @@ const PrepopulatedEngine* const engines_AR[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo_ar,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Austria
|
|
@@ -68,7 +69,7 @@ const PrepopulatedEngine* const engines_AT[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo_at,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Australia
|
|
@@ -76,7 +77,7 @@ const PrepopulatedEngine* const engines_AU[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo_au,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Bosnia and Herzegovina
|
|
@@ -92,7 +93,7 @@ const PrepopulatedEngine* const engines_BE[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Bulgaria
|
|
@@ -124,7 +125,7 @@ const PrepopulatedEngine* const engines_BN[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Bolivia
|
|
@@ -132,7 +133,7 @@ const PrepopulatedEngine* const engines_BO[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Brazil
|
|
@@ -140,7 +141,7 @@ const PrepopulatedEngine* const engines_BR[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo_br,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Belarus
|
|
@@ -157,11 +158,12 @@ const PrepopulatedEngine* const engines_BZ[] = {
|
|
&bing,
|
|
&yahoo,
|
|
&duckduckgo,
|
|
+ &duckduckgo_light,
|
|
};
|
|
|
|
// Canada
|
|
const PrepopulatedEngine* const engines_CA[] = {
|
|
- &googleen, &google, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo,
|
|
+ &googleen, &google, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Switzerland
|
|
@@ -169,6 +171,7 @@ const PrepopulatedEngine* const engines_CH[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&duckduckgo,
|
|
+ &duckduckgo_light,
|
|
&yahoo_ch,
|
|
};
|
|
|
|
@@ -177,7 +180,7 @@ const PrepopulatedEngine* const engines_CL[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo_cl,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// China
|
|
@@ -190,7 +193,7 @@ const PrepopulatedEngine* const engines_CO[] = {
|
|
&googleen, &google,
|
|
&yahoo_co,
|
|
&bing,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Costa Rica
|
|
@@ -198,7 +201,7 @@ const PrepopulatedEngine* const engines_CR[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Czech Republic
|
|
@@ -214,7 +217,7 @@ const PrepopulatedEngine* const engines_DE[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo_de,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Denmark
|
|
@@ -222,7 +225,7 @@ const PrepopulatedEngine* const engines_DK[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo_dk,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Dominican Republic
|
|
@@ -230,7 +233,7 @@ const PrepopulatedEngine* const engines_DO[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Algeria
|
|
@@ -246,7 +249,7 @@ const PrepopulatedEngine* const engines_EC[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Estonia
|
|
@@ -270,7 +273,7 @@ const PrepopulatedEngine* const engines_ES[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo_es,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Finland
|
|
@@ -278,7 +281,7 @@ const PrepopulatedEngine* const engines_FI[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo_fi,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Faroe Islands
|
|
@@ -286,7 +289,7 @@ const PrepopulatedEngine* const engines_FO[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// France
|
|
@@ -302,7 +305,7 @@ const PrepopulatedEngine* const engines_GB[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo_uk,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Greece
|
|
@@ -310,7 +313,7 @@ const PrepopulatedEngine* const engines_GR[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Guatemala
|
|
@@ -318,7 +321,7 @@ const PrepopulatedEngine* const engines_GT[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Hong Kong
|
|
@@ -334,7 +337,7 @@ const PrepopulatedEngine* const engines_HN[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Croatia
|
|
@@ -342,7 +345,7 @@ const PrepopulatedEngine* const engines_HR[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Hungary
|
|
@@ -350,7 +353,7 @@ const PrepopulatedEngine* const engines_HU[] = {
|
|
&googleen, &google,
|
|
&yahoo,
|
|
&bing,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Indonesia
|
|
@@ -358,7 +361,7 @@ const PrepopulatedEngine* const engines_ID[] = {
|
|
&googleen, &google,
|
|
&yahoo_id,
|
|
&bing,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Ireland
|
|
@@ -366,7 +369,7 @@ const PrepopulatedEngine* const engines_IE[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Israel
|
|
@@ -382,7 +385,7 @@ const PrepopulatedEngine* const engines_IN[] = {
|
|
&googleen, &google,
|
|
&yahoo_in,
|
|
&bing,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Iraq
|
|
@@ -405,7 +408,7 @@ const PrepopulatedEngine* const engines_IS[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Italy
|
|
@@ -413,7 +416,7 @@ const PrepopulatedEngine* const engines_IT[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Jamaica
|
|
@@ -421,7 +424,7 @@ const PrepopulatedEngine* const engines_JM[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Jordan
|
|
@@ -445,7 +448,7 @@ const PrepopulatedEngine* const engines_KE[] = {
|
|
&googleen, &google,
|
|
&yahoo,
|
|
&bing,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// South Korea
|
|
@@ -478,6 +481,7 @@ const PrepopulatedEngine* const engines_LB[] = {
|
|
&bing,
|
|
&yahoo,
|
|
&duckduckgo,
|
|
+ &duckduckgo_light,
|
|
};
|
|
|
|
// Liechtenstein
|
|
@@ -485,6 +489,7 @@ const PrepopulatedEngine* const engines_LI[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&duckduckgo,
|
|
+ &duckduckgo_light,
|
|
&yahoo,
|
|
};
|
|
|
|
@@ -500,7 +505,7 @@ const PrepopulatedEngine* const engines_LT[] = {
|
|
const PrepopulatedEngine* const engines_LU[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
&yahoo,
|
|
};
|
|
|
|
@@ -533,7 +538,7 @@ const PrepopulatedEngine* const engines_MC[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Moldova
|
|
@@ -541,7 +546,7 @@ const PrepopulatedEngine* const engines_MD[] = {
|
|
&googleen, &google,
|
|
&yandex_ru,
|
|
&mail_ru,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Montenegro
|
|
@@ -557,7 +562,7 @@ const PrepopulatedEngine* const engines_MK[] = {
|
|
&googleen, &google,
|
|
&yahoo,
|
|
&bing,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Mexico
|
|
@@ -565,7 +570,7 @@ const PrepopulatedEngine* const engines_MX[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo_mx,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Malaysia
|
|
@@ -581,7 +586,7 @@ const PrepopulatedEngine* const engines_NI[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Netherlands
|
|
@@ -589,7 +594,7 @@ const PrepopulatedEngine* const engines_NL[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo_nl,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Norway
|
|
@@ -598,13 +603,14 @@ const PrepopulatedEngine* const engines_NO[] = {
|
|
&bing,
|
|
&yahoo,
|
|
&duckduckgo,
|
|
+ &duckduckgo_light,
|
|
};
|
|
|
|
// New Zealand
|
|
const PrepopulatedEngine* const engines_NZ[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
&yahoo_nz,
|
|
};
|
|
|
|
@@ -621,7 +627,7 @@ const PrepopulatedEngine* const engines_PA[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Peru
|
|
@@ -629,7 +635,7 @@ const PrepopulatedEngine* const engines_PE[] = {
|
|
&googleen, &google,
|
|
&yahoo_pe,
|
|
&bing,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Philippines
|
|
@@ -637,7 +643,7 @@ const PrepopulatedEngine* const engines_PH[] = {
|
|
&googleen, &google,
|
|
&yahoo_ph,
|
|
&bing,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Pakistan
|
|
@@ -653,7 +659,7 @@ const PrepopulatedEngine* const engines_PL[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Puerto Rico
|
|
@@ -661,7 +667,7 @@ const PrepopulatedEngine* const engines_PR[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Portugal
|
|
@@ -669,7 +675,7 @@ const PrepopulatedEngine* const engines_PT[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Paraguay
|
|
@@ -677,7 +683,7 @@ const PrepopulatedEngine* const engines_PY[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Qatar
|
|
@@ -693,7 +699,7 @@ const PrepopulatedEngine* const engines_RO[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Serbia
|
|
@@ -701,7 +707,7 @@ const PrepopulatedEngine* const engines_RS[] = {
|
|
&googleen, &google,
|
|
&yahoo,
|
|
&bing,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Russia
|
|
@@ -733,7 +739,7 @@ const PrepopulatedEngine* const engines_SE[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo_se,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Singapore
|
|
@@ -749,7 +755,7 @@ const PrepopulatedEngine* const engines_SI[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Slovakia
|
|
@@ -757,7 +763,7 @@ const PrepopulatedEngine* const engines_SK[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// El Salvador
|
|
@@ -765,7 +771,7 @@ const PrepopulatedEngine* const engines_SV[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Syria
|
|
@@ -805,7 +811,7 @@ const PrepopulatedEngine* const engines_TT[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Taiwan
|
|
@@ -837,7 +843,7 @@ const PrepopulatedEngine* const engines_US[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Uruguay
|
|
@@ -845,7 +851,7 @@ const PrepopulatedEngine* const engines_UY[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Venezuela
|
|
@@ -853,7 +859,7 @@ const PrepopulatedEngine* const engines_VE[] = {
|
|
&googleen, &google,
|
|
&yahoo_ve,
|
|
&bing,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Vietnam
|
|
@@ -877,7 +883,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
|
|
&googleen, &google,
|
|
&bing,
|
|
&yahoo,
|
|
- &duckduckgo,
|
|
+ &duckduckgo, &duckduckgo_light,
|
|
};
|
|
|
|
// Zimbabwe
|
|
--
|
|
2.17.1
|
|
|