Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4534)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/search_engines/template_url_prepopulate_data.cc

Issue 10828401: Add a getter for search provider logos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/search_engines/template_url.h ('K') | « chrome/browser/search_engines/template_url.h ('k') | chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/search_engines/template_url_prepopulate_data.cc
diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc
index acd3089701c70accc981e12cdad80915b2971c9b..673caf65decfb06594782074a26d95763e1c17d3 100644
--- a/chrome/browser/search_engines/template_url_prepopulate_data.cc
+++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc
@@ -47,6 +47,9 @@ namespace {
struct PrepopulatedEngine {
const wchar_t* const name;
const wchar_t* const keyword;
+ const char* const logo_100_percent_url; // If NULL, there is no logo.
+ const char* const logo_200_percent_url; // If NULL, there is no high-DPI
+ // logo.
const char* const favicon_url; // If NULL, there is no favicon.
const char* const search_url;
const char* const encoding;
@@ -92,6 +95,8 @@ struct PrepopulatedEngine {
const PrepopulatedEngine abcsok = {
L"ABC S\x00f8k",
L"abcsok.no",
+ NULL,
+ NULL,
"http://abcsok.no/favicon.ico",
"http://abcsok.no/index.html?q={searchTerms}",
"UTF-8",
@@ -104,6 +109,8 @@ const PrepopulatedEngine abcsok = {
const PrepopulatedEngine altavista = {
L"AltaVista",
L"altavista.com",
+ NULL,
+ NULL,
"http://www.altavista.com/favicon.ico",
"http://www.altavista.com/web/results?q={searchTerms}",
"UTF-8",
@@ -116,6 +123,8 @@ const PrepopulatedEngine altavista = {
const PrepopulatedEngine altavista_ar = {
L"AltaVista",
L"ar.altavista.com",
+ NULL,
+ NULL,
"http://ar.altavista.com/favicon.ico",
"http://ar.altavista.com/web/results?q={searchTerms}",
"UTF-8",
@@ -128,6 +137,8 @@ const PrepopulatedEngine altavista_ar = {
const PrepopulatedEngine altavista_se = {
L"AltaVista",
L"se.altavista.com",
+ NULL,
+ NULL,
"http://se.altavista.com/favicon.ico",
"http://se.altavista.com/web/results?q={searchTerms}",
"UTF-8",
@@ -140,6 +151,8 @@ const PrepopulatedEngine altavista_se = {
const PrepopulatedEngine aol = {
L"AOL",
L"aol.com",
+ NULL,
+ NULL,
"http://search.aol.com/favicon.ico",
"http://search.aol.com/aol/search?query={searchTerms}",
"UTF-8",
@@ -152,6 +165,8 @@ const PrepopulatedEngine aol = {
const PrepopulatedEngine araby = {
L"\x0639\x0631\x0628\x064a",
L"araby.com",
+ NULL,
+ NULL,
"http://araby.com/favicon.ico",
"http://araby.com/?q={searchTerms}",
"UTF-8",
@@ -164,6 +179,8 @@ const PrepopulatedEngine araby = {
const PrepopulatedEngine ask = {
L"Ask",
L"ask.com",
+ NULL,
+ NULL,
"http://www.ask.com/favicon.ico",
"http://www.ask.com/web?q={searchTerms}",
"UTF-8",
@@ -176,6 +193,8 @@ const PrepopulatedEngine ask = {
const PrepopulatedEngine ask_de = {
L"Ask.com Deutschland",
L"de.ask.com",
+ NULL,
+ NULL,
"http://de.ask.com/favicon.ico",
"http://de.ask.com/web?q={searchTerms}",
"UTF-8",
@@ -188,6 +207,8 @@ const PrepopulatedEngine ask_de = {
const PrepopulatedEngine ask_es = {
L"Ask.com Espa" L"\x00f1" L"a",
L"es.ask.com",
+ NULL,
+ NULL,
"http://es.ask.com/favicon.ico",
"http://es.ask.com/web?q={searchTerms}",
"UTF-8",
@@ -200,6 +221,8 @@ const PrepopulatedEngine ask_es = {
const PrepopulatedEngine ask_it = {
L"Ask.com Italia",
L"it.ask.com",
+ NULL,
+ NULL,
"http://it.ask.com/favicon.ico",
"http://it.ask.com/web?q={searchTerms}",
"UTF-8",
@@ -212,6 +235,8 @@ const PrepopulatedEngine ask_it = {
const PrepopulatedEngine ask_nl = {
L"Ask.com Nederland",
L"nl.ask.com",
+ NULL,
+ NULL,
"http://nl.ask.com/favicon.ico",
"http://nl.ask.com/web?q={searchTerms}",
"UTF-8",
@@ -224,6 +249,8 @@ const PrepopulatedEngine ask_nl = {
const PrepopulatedEngine ask_uk = {
L"Ask Jeeves",
L"uk.ask.com",
+ NULL,
+ NULL,
"http://uk.ask.com/favicon.ico",
"http://uk.ask.com/web?q={searchTerms}",
"UTF-8",
@@ -236,6 +263,8 @@ const PrepopulatedEngine ask_uk = {
const PrepopulatedEngine atlas_cz = {
L"Atlas",
L"atlas.cz",
+ NULL,
+ NULL,
"http://img.atlas.cz/favicon.ico",
"http://search.atlas.cz/?q={searchTerms}",
"windows-1250",
@@ -248,6 +277,8 @@ const PrepopulatedEngine atlas_cz = {
const PrepopulatedEngine atlas_sk = {
L"ATLAS.SK",
L"atlas.sk",
+ NULL,
+ NULL,
"http://www.atlas.sk/images/favicon.ico",
"http://hladaj.atlas.sk/fulltext/?phrase={searchTerms}",
"UTF-8",
@@ -260,6 +291,8 @@ const PrepopulatedEngine atlas_sk = {
const PrepopulatedEngine baidu = {
L"\x767e\x5ea6",
L"baidu.com",
+ NULL,
+ NULL,
"http://www.baidu.com/favicon.ico",
"http://www.baidu.com/s?wd={searchTerms}",
"GB2312",
@@ -272,6 +305,8 @@ const PrepopulatedEngine baidu = {
const PrepopulatedEngine bing = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?q={searchTerms}",
"UTF-8",
@@ -284,6 +319,8 @@ const PrepopulatedEngine bing = {
const PrepopulatedEngine bing_ar_XA = {
L"Bing",
L"bing.com_", // bing.com is taken by bing_en_XA.
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=ar-XA&q={searchTerms}",
"UTF-8",
@@ -297,6 +334,8 @@ const PrepopulatedEngine bing_ar_XA = {
const PrepopulatedEngine bing_bg_BG = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=bg-BG&q={searchTerms}",
"UTF-8",
@@ -309,6 +348,8 @@ const PrepopulatedEngine bing_bg_BG = {
const PrepopulatedEngine bing_cs_CZ = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=cs-CZ&q={searchTerms}",
"UTF-8",
@@ -321,6 +362,8 @@ const PrepopulatedEngine bing_cs_CZ = {
const PrepopulatedEngine bing_da_DK = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=da-DK&q={searchTerms}",
"UTF-8",
@@ -333,6 +376,8 @@ const PrepopulatedEngine bing_da_DK = {
const PrepopulatedEngine bing_de_AT = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=de-AT&q={searchTerms}",
"UTF-8",
@@ -345,6 +390,8 @@ const PrepopulatedEngine bing_de_AT = {
const PrepopulatedEngine bing_de_CH = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=de-CH&q={searchTerms}",
"UTF-8",
@@ -357,6 +404,8 @@ const PrepopulatedEngine bing_de_CH = {
const PrepopulatedEngine bing_de_DE = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=de-DE&q={searchTerms}",
"UTF-8",
@@ -369,6 +418,8 @@ const PrepopulatedEngine bing_de_DE = {
const PrepopulatedEngine bing_el_GR = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=el-GR&q={searchTerms}",
"UTF-8",
@@ -381,6 +432,8 @@ const PrepopulatedEngine bing_el_GR = {
const PrepopulatedEngine bing_en_AU = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=en-AU&q={searchTerms}",
"UTF-8",
@@ -393,6 +446,8 @@ const PrepopulatedEngine bing_en_AU = {
const PrepopulatedEngine bing_en_CA = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=en-CA&q={searchTerms}",
"UTF-8",
@@ -405,6 +460,8 @@ const PrepopulatedEngine bing_en_CA = {
const PrepopulatedEngine bing_en_GB = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=en-GB&q={searchTerms}",
"UTF-8",
@@ -417,6 +474,8 @@ const PrepopulatedEngine bing_en_GB = {
const PrepopulatedEngine bing_en_ID = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=en-ID&q={searchTerms}",
"UTF-8",
@@ -429,6 +488,8 @@ const PrepopulatedEngine bing_en_ID = {
const PrepopulatedEngine bing_en_IE = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=en-IE&q={searchTerms}",
"UTF-8",
@@ -441,6 +502,8 @@ const PrepopulatedEngine bing_en_IE = {
const PrepopulatedEngine bing_en_IN = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=en-IN&q={searchTerms}",
"UTF-8",
@@ -453,6 +516,8 @@ const PrepopulatedEngine bing_en_IN = {
const PrepopulatedEngine bing_en_MY = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=en-MY&q={searchTerms}",
"UTF-8",
@@ -465,6 +530,8 @@ const PrepopulatedEngine bing_en_MY = {
const PrepopulatedEngine bing_en_NZ = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=en-NZ&q={searchTerms}",
"UTF-8",
@@ -477,6 +544,8 @@ const PrepopulatedEngine bing_en_NZ = {
const PrepopulatedEngine bing_en_PH = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=en-PH&q={searchTerms}",
"UTF-8",
@@ -489,6 +558,8 @@ const PrepopulatedEngine bing_en_PH = {
const PrepopulatedEngine bing_en_SG = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=en-SG&q={searchTerms}",
"UTF-8",
@@ -501,6 +572,8 @@ const PrepopulatedEngine bing_en_SG = {
const PrepopulatedEngine bing_en_US = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=en-US&q={searchTerms}",
"UTF-8",
@@ -513,6 +586,8 @@ const PrepopulatedEngine bing_en_US = {
const PrepopulatedEngine bing_en_XA = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=en-XA&q={searchTerms}",
"UTF-8",
@@ -525,6 +600,8 @@ const PrepopulatedEngine bing_en_XA = {
const PrepopulatedEngine bing_en_ZA = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=en-ZA&q={searchTerms}",
"UTF-8",
@@ -537,6 +614,8 @@ const PrepopulatedEngine bing_en_ZA = {
const PrepopulatedEngine bing_es_AR = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=es-AR&q={searchTerms}",
"UTF-8",
@@ -549,6 +628,8 @@ const PrepopulatedEngine bing_es_AR = {
const PrepopulatedEngine bing_es_CL = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=es-CL&q={searchTerms}",
"UTF-8",
@@ -561,6 +642,8 @@ const PrepopulatedEngine bing_es_CL = {
const PrepopulatedEngine bing_es_ES = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=es-ES&q={searchTerms}",
"UTF-8",
@@ -573,6 +656,8 @@ const PrepopulatedEngine bing_es_ES = {
const PrepopulatedEngine bing_es_MX = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=es-MX&q={searchTerms}",
"UTF-8",
@@ -585,6 +670,8 @@ const PrepopulatedEngine bing_es_MX = {
const PrepopulatedEngine bing_es_XL = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=es-XL&q={searchTerms}",
"UTF-8",
@@ -597,6 +684,8 @@ const PrepopulatedEngine bing_es_XL = {
const PrepopulatedEngine bing_et_EE = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=et-EE&q={searchTerms}",
"UTF-8",
@@ -609,6 +698,8 @@ const PrepopulatedEngine bing_et_EE = {
const PrepopulatedEngine bing_fi_FI = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=fi-FI&q={searchTerms}",
"UTF-8",
@@ -621,6 +712,8 @@ const PrepopulatedEngine bing_fi_FI = {
const PrepopulatedEngine bing_fr_BE = {
L"Bing",
L"bing.com_", // bing.com is taken by bing_nl_BE.
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=fr-BE&q={searchTerms}",
"UTF-8",
@@ -633,6 +726,8 @@ const PrepopulatedEngine bing_fr_BE = {
const PrepopulatedEngine bing_fr_CA = {
L"Bing",
L"bing.com_", // bing.com is taken by bing_en_CA.
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=fr-CA&q={searchTerms}",
"UTF-8",
@@ -645,6 +740,8 @@ const PrepopulatedEngine bing_fr_CA = {
const PrepopulatedEngine bing_fr_CH = {
L"Bing",
L"bing.com_", // bing.com is taken by bing_de_CH.
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=fr-CH&q={searchTerms}",
"UTF-8",
@@ -657,6 +754,8 @@ const PrepopulatedEngine bing_fr_CH = {
const PrepopulatedEngine bing_fr_FR = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=fr-FR&q={searchTerms}",
"UTF-8",
@@ -669,6 +768,8 @@ const PrepopulatedEngine bing_fr_FR = {
const PrepopulatedEngine bing_he_IL = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=he-IL&q={searchTerms}",
"UTF-8",
@@ -681,6 +782,8 @@ const PrepopulatedEngine bing_he_IL = {
const PrepopulatedEngine bing_hr_HR = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=hr-HR&q={searchTerms}",
"UTF-8",
@@ -693,6 +796,8 @@ const PrepopulatedEngine bing_hr_HR = {
const PrepopulatedEngine bing_hu_HU = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=hu-HU&q={searchTerms}",
"UTF-8",
@@ -705,6 +810,8 @@ const PrepopulatedEngine bing_hu_HU = {
const PrepopulatedEngine bing_it_IT = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=it-IT&q={searchTerms}",
"UTF-8",
@@ -717,6 +824,8 @@ const PrepopulatedEngine bing_it_IT = {
const PrepopulatedEngine bing_ja_JP = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=ja-JP&q={searchTerms}",
"UTF-8",
@@ -729,6 +838,8 @@ const PrepopulatedEngine bing_ja_JP = {
const PrepopulatedEngine bing_ko_KR = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=ko-KR&q={searchTerms}",
"UTF-8",
@@ -741,6 +852,8 @@ const PrepopulatedEngine bing_ko_KR = {
const PrepopulatedEngine bing_lt_LT = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=lt-LT&q={searchTerms}",
"UTF-8",
@@ -753,6 +866,8 @@ const PrepopulatedEngine bing_lt_LT = {
const PrepopulatedEngine bing_lv_LV = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=lv-LV&q={searchTerms}",
"UTF-8",
@@ -765,6 +880,8 @@ const PrepopulatedEngine bing_lv_LV = {
const PrepopulatedEngine bing_nb_NO = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=nb-NO&q={searchTerms}",
"UTF-8",
@@ -777,6 +894,8 @@ const PrepopulatedEngine bing_nb_NO = {
const PrepopulatedEngine bing_nl_BE = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=nl-BE&q={searchTerms}",
"UTF-8",
@@ -789,6 +908,8 @@ const PrepopulatedEngine bing_nl_BE = {
const PrepopulatedEngine bing_nl_NL = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=nl-NL&q={searchTerms}",
"UTF-8",
@@ -801,6 +922,8 @@ const PrepopulatedEngine bing_nl_NL = {
const PrepopulatedEngine bing_pl_PL = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=pl-PL&q={searchTerms}",
"UTF-8",
@@ -813,6 +936,8 @@ const PrepopulatedEngine bing_pl_PL = {
const PrepopulatedEngine bing_pt_BR = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=pt-BR&q={searchTerms}",
"UTF-8",
@@ -825,6 +950,8 @@ const PrepopulatedEngine bing_pt_BR = {
const PrepopulatedEngine bing_pt_PT = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=pt-PT&q={searchTerms}",
"UTF-8",
@@ -837,6 +964,8 @@ const PrepopulatedEngine bing_pt_PT = {
const PrepopulatedEngine bing_ro_RO = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=ro-RO&q={searchTerms}",
"UTF-8",
@@ -849,6 +978,8 @@ const PrepopulatedEngine bing_ro_RO = {
const PrepopulatedEngine bing_ru_RU = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=ru-RU&q={searchTerms}",
"UTF-8",
@@ -861,6 +992,8 @@ const PrepopulatedEngine bing_ru_RU = {
const PrepopulatedEngine bing_sl_SI = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=sl-SI&q={searchTerms}",
"UTF-8",
@@ -873,6 +1006,8 @@ const PrepopulatedEngine bing_sl_SI = {
const PrepopulatedEngine bing_sk_SK = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=sk-SK&q={searchTerms}",
"UTF-8",
@@ -885,6 +1020,8 @@ const PrepopulatedEngine bing_sk_SK = {
const PrepopulatedEngine bing_sv_SE = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=sv-SE&q={searchTerms}",
"UTF-8",
@@ -897,6 +1034,8 @@ const PrepopulatedEngine bing_sv_SE = {
const PrepopulatedEngine bing_th_TH = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=th-TH&q={searchTerms}",
"UTF-8",
@@ -909,6 +1048,8 @@ const PrepopulatedEngine bing_th_TH = {
const PrepopulatedEngine bing_tr_TR = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=tr-TR&q={searchTerms}",
"UTF-8",
@@ -921,6 +1062,8 @@ const PrepopulatedEngine bing_tr_TR = {
const PrepopulatedEngine bing_uk_UA = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=uk-UA&q={searchTerms}",
"UTF-8",
@@ -933,6 +1076,8 @@ const PrepopulatedEngine bing_uk_UA = {
const PrepopulatedEngine bing_zh_CN = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=zh-CN&q={searchTerms}",
"UTF-8",
@@ -945,6 +1090,8 @@ const PrepopulatedEngine bing_zh_CN = {
const PrepopulatedEngine bing_zh_HK = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=zh-HK&q={searchTerms}",
"UTF-8",
@@ -957,6 +1104,8 @@ const PrepopulatedEngine bing_zh_HK = {
const PrepopulatedEngine bing_zh_TW = {
L"Bing",
L"bing.com",
+ NULL,
+ NULL,
"http://www.bing.com/s/wlflag.ico",
"http://www.bing.com/search?setmkt=zh-TW&q={searchTerms}",
"UTF-8",
@@ -969,6 +1118,8 @@ const PrepopulatedEngine bing_zh_TW = {
const PrepopulatedEngine centrum_cz = {
L"Centrum.cz",
L"centrum.cz",
+ NULL,
+ NULL,
"http://img.centrum.cz/6/vy2/o/favicon.ico",
"http://search.centrum.cz/index.php?charset={inputEncoding}&q={searchTerms}",
"UTF-8",
@@ -981,6 +1132,8 @@ const PrepopulatedEngine centrum_cz = {
const PrepopulatedEngine centrum_sk = {
L"Centrum.sk",
L"centrum.sk",
+ NULL,
+ NULL,
"http://img.centrum.sk/4/favicon.ico",
"http://search.centrum.sk/index.php?charset={inputEncoding}&q={searchTerms}",
"UTF-8",
@@ -993,6 +1146,8 @@ const PrepopulatedEngine centrum_sk = {
const PrepopulatedEngine daum = {
L"Daum",
L"daum.net",
+ NULL,
+ NULL,
"http://search.daum.net/favicon.ico",
"http://search.daum.net/search?q={searchTerms}",
"EUC-KR",
@@ -1005,6 +1160,8 @@ const PrepopulatedEngine daum = {
const PrepopulatedEngine delfi_lt = {
L"DELFI",
L"delfi.lt",
+ NULL,
+ NULL,
"http://search.delfi.lt/img/favicon.png",
"http://search.delfi.lt/search.php?q={searchTerms}",
"UTF-8",
@@ -1017,6 +1174,8 @@ const PrepopulatedEngine delfi_lt = {
const PrepopulatedEngine delfi_lv = {
L"DELFI",
L"delfi.lv",
+ NULL,
+ NULL,
"http://smart.delfi.lv/img/smart_search.png",
"http://smart.delfi.lv/i.php?enc={inputEncoding}&q={searchTerms}",
"UTF-8",
@@ -1029,6 +1188,8 @@ const PrepopulatedEngine delfi_lv = {
const PrepopulatedEngine diri = {
L"diri",
L"diri.bg",
+ NULL,
+ NULL,
"http://i.dir.bg/diri/images/favicon.ico",
"http://diri.bg/search.php?textfield={searchTerms}",
"windows-1251",
@@ -1041,6 +1202,8 @@ const PrepopulatedEngine diri = {
const PrepopulatedEngine eniro_fi = {
L"Eniro",
L"eniro.fi",
+ NULL,
+ NULL,
"http://eniro.fi/favicon.ico",
"http://eniro.fi/query?search_word={searchTerms}&what=web_local",
"ISO-8859-1",
@@ -1053,6 +1216,8 @@ const PrepopulatedEngine eniro_fi = {
const PrepopulatedEngine eniro_se = {
L"Eniro",
L"eniro.se",
+ NULL,
+ NULL,
"http://eniro.se/favicon.ico",
"http://eniro.se/query?search_word={searchTerms}&what=web_local",
"ISO-8859-1",
@@ -1065,6 +1230,8 @@ const PrepopulatedEngine eniro_se = {
const PrepopulatedEngine fonecta_02_fi = {
L"Fonecta 02.fi",
L"www.fi",
+ NULL,
+ NULL,
"http://www.02.fi/img/favicon.ico",
"http://www.02.fi/haku/{searchTerms}",
"UTF-8",
@@ -1077,6 +1244,8 @@ const PrepopulatedEngine fonecta_02_fi = {
const PrepopulatedEngine goo = {
L"goo",
L"search.goo.ne.jp",
+ NULL,
+ NULL,
"http://goo.ne.jp/favicon.ico",
"http://search.goo.ne.jp/web.jsp?MT={searchTerms}&IE={inputEncoding}",
"UTF-8",
@@ -1089,6 +1258,8 @@ const PrepopulatedEngine goo = {
const PrepopulatedEngine google = {
L"Google",
L"google.com", // This will be dynamically updated by the TemplateURL system.
+ "https://www.google.com/images/chrome_search/google_logo.png",
+ "https://www.google.com/images/chrome_search/google_logo_2x.png",
"http://www.google.com/favicon.ico",
"{google:baseURL}search?q={searchTerms}&{google:RLZ}"
"{google:acceptedSuggestion}{google:originalQueryForSuggestion}"
@@ -1106,6 +1277,8 @@ const PrepopulatedEngine google = {
const PrepopulatedEngine guruji = {
L"guruji",
L"guruji.com",
+ NULL,
+ NULL,
"http://guruji.com/favicon.ico",
"http://guruji.com/search?q={searchTerms}",
"UTF-8",
@@ -1118,6 +1291,8 @@ const PrepopulatedEngine guruji = {
const PrepopulatedEngine hispavista = {
L"hispavista",
L"hispavista.com",
+ NULL,
+ NULL,
"http://buscar.hispavista.com/favicon.ico",
"http://buscar.hispavista.com/?cadena={searchTerms}",
"iso-8859-1",
@@ -1130,6 +1305,8 @@ const PrepopulatedEngine hispavista = {
const PrepopulatedEngine in = {
L"in.gr",
L"in.gr",
+ NULL,
+ NULL,
"http://www.in.gr/favicon.ico",
"http://find.in.gr/?qs={searchTerms}",
"ISO-8859-7",
@@ -1142,6 +1319,8 @@ const PrepopulatedEngine in = {
const PrepopulatedEngine jabse = {
L"Jabse",
L"jabse.com",
+ NULL,
+ NULL,
"http://www.jabse.com/favicon.ico",
"http://www.jabse.com/searchmachine.php?query={searchTerms}",
"UTF-8",
@@ -1154,6 +1333,8 @@ const PrepopulatedEngine jabse = {
const PrepopulatedEngine jubii = {
L"Jubii",
L"jubii.dk",
+ NULL,
+ NULL,
"http://search.jubii.dk/favicon_jubii.ico",
"http://search.jubii.dk/cgi-bin/pursuit?query={searchTerms}",
"ISO-8859-1",
@@ -1166,6 +1347,8 @@ const PrepopulatedEngine jubii = {
const PrepopulatedEngine kvasir = {
L"Kvasir",
L"kvasir.no",
+ NULL,
+ NULL,
"http://www.kvasir.no/img/favicon.ico",
"http://www.kvasir.no/nettsok/searchResult.html?searchExpr={searchTerms}",
"ISO-8859-1",
@@ -1178,6 +1361,8 @@ const PrepopulatedEngine kvasir = {
const PrepopulatedEngine latne = {
L"LATNE",
L"latne.lv",
+ NULL,
+ NULL,
"http://latne.lv/favicon.ico",
"http://latne.lv/siets.php?q={searchTerms}",
"UTF-8",
@@ -1190,6 +1375,8 @@ const PrepopulatedEngine latne = {
const PrepopulatedEngine leit = {
L"leit.is",
L"leit.is",
+ NULL,
+ NULL,
"http://leit.is/leit.ico",
"http://leit.is/query.aspx?qt={searchTerms}",
"ISO-8859-1",
@@ -1202,6 +1389,8 @@ const PrepopulatedEngine leit = {
const PrepopulatedEngine libero = {
L"Libero",
L"libero.it",
+ NULL,
+ NULL,
"http://arianna.libero.it/favicon.ico",
"http://arianna.libero.it/search/abin/integrata.cgi?query={searchTerms}",
"ISO-8859-1",
@@ -1214,6 +1403,8 @@ const PrepopulatedEngine libero = {
const PrepopulatedEngine mail_ru = {
L"@MAIL.RU",
L"mail.ru",
+ NULL,
+ NULL,
"http://img.go.mail.ru/favicon.ico",
"http://go.mail.ru/search?q={searchTerms}",
"windows-1251",
@@ -1226,6 +1417,8 @@ const PrepopulatedEngine mail_ru = {
const PrepopulatedEngine maktoob = {
L"\x0645\x0643\x062a\x0648\x0628",
L"maktoob.com",
+ NULL,
+ NULL,
"http://www.maktoob.com/favicon.ico",
"http://www.maktoob.com/searchResult.php?q={searchTerms}",
"UTF-8",
@@ -1238,6 +1431,8 @@ const PrepopulatedEngine maktoob = {
const PrepopulatedEngine masrawy = {
L"\x0645\x0635\x0631\x0627\x0648\x064a",
L"masrawy.com",
+ NULL,
+ NULL,
"http://www.masrawy.com/new/images/masrawy.ico",
"http://masrawy.com/new/search.aspx?sr={searchTerms}",
"windows-1256",
@@ -1250,6 +1445,8 @@ const PrepopulatedEngine masrawy = {
const PrepopulatedEngine mynet = {
L"MYNET",
L"mynet.com",
+ NULL,
+ NULL,
"http://img.mynet.com/mynetfavori.ico",
"http://arama.mynet.com/search.aspx?q={searchTerms}&pg=q",
"windows-1254",
@@ -1262,6 +1459,8 @@ const PrepopulatedEngine mynet = {
const PrepopulatedEngine najdi = {
L"Najdi.si",
L"najdi.si",
+ NULL,
+ NULL,
"http://www.najdi.si/master/favicon.ico",
"http://www.najdi.si/search.jsp?q={searchTerms}",
"UTF-8",
@@ -1274,6 +1473,8 @@ const PrepopulatedEngine najdi = {
const PrepopulatedEngine nate = {
L"\xb124\xc774\xd2b8\xb2f7\xcef4",
L"nate.com",
+ NULL,
+ NULL,
"http://nate.search.empas.com/favicon.ico",
"http://nate.search.empas.com/search/all.html?q={searchTerms}",
"EUC-KR",
@@ -1286,6 +1487,8 @@ const PrepopulatedEngine nate = {
const PrepopulatedEngine naver = {
L"\xb124\xc774\xbc84",
L"naver.com",
+ NULL,
+ NULL,
"http://search.naver.com/favicon.ico",
"http://search.naver.com/search.naver?ie={inputEncoding}&query={searchTerms}",
"UTF-8",
@@ -1299,6 +1502,8 @@ const PrepopulatedEngine naver = {
const PrepopulatedEngine neti = {
L"NETI",
L"neti.ee",
+ NULL,
+ NULL,
"http://www.neti.ee/favicon.ico",
"http://www.neti.ee/cgi-bin/otsing?query={searchTerms}",
"ISO-8859-1",
@@ -1311,6 +1516,8 @@ const PrepopulatedEngine neti = {
const PrepopulatedEngine netsprint = {
L"NetSprint",
L"netsprint.pl",
+ NULL,
+ NULL,
"http://netsprint.pl/favicon.ico",
"http://www.netsprint.pl/serwis/search?q={searchTerms}",
"UTF-8",
@@ -1323,6 +1530,8 @@ const PrepopulatedEngine netsprint = {
const PrepopulatedEngine nur_kz = {
L"NUR.KZ",
L"nur.kz",
+ NULL,
+ NULL,
"http://www.nur.kz/favicon_kz.ico",
"http://search.nur.kz/?encoding={inputEncoding}&query={searchTerms}",
"UTF-8",
@@ -1335,6 +1544,8 @@ const PrepopulatedEngine nur_kz = {
const PrepopulatedEngine ok = {
L"OK.hu",
L"ok.hu",
+ NULL,
+ NULL,
"http://ok.hu/gfx/favicon.ico",
"http://ok.hu/katalogus?q={searchTerms}",
"ISO-8859-2",
@@ -1347,6 +1558,8 @@ const PrepopulatedEngine ok = {
const PrepopulatedEngine onet = {
L"Onet.pl",
L"onet.pl",
+ NULL,
+ NULL,
"http://szukaj.onet.pl/favicon.ico",
"http://szukaj.onet.pl/query.html?qt={searchTerms}",
"ISO-8859-2",
@@ -1359,6 +1572,8 @@ const PrepopulatedEngine onet = {
const PrepopulatedEngine pogodak_rs = {
L"Pogodak!",
L"pogodak.rs",
+ NULL,
+ NULL,
"http://www.pogodak.rs/favicon.ico",
"http://www.pogodak.rs/search.jsp?q={searchTerms}",
"UTF-8",
@@ -1371,6 +1586,8 @@ const PrepopulatedEngine pogodak_rs = {
const PrepopulatedEngine rambler = {
L"Rambler",
L"rambler.ru",
+ NULL,
+ NULL,
"http://www.rambler.ru/favicon.ico",
"http://www.rambler.ru/srch?words={searchTerms}",
"windows-1251",
@@ -1383,6 +1600,8 @@ const PrepopulatedEngine rambler = {
const PrepopulatedEngine rediff = {
L"Rediff",
L"rediff.com",
+ NULL,
+ NULL,
"http://search1.rediff.com/favicon.ico",
"http://search1.rediff.com/dirsrch/default.asp?MT={searchTerms}",
"UTF-8",
@@ -1395,6 +1614,8 @@ const PrepopulatedEngine rediff = {
const PrepopulatedEngine rednano = {
L"Rednano",
L"rednano.sg",
+ NULL,
+ NULL,
"http://rednano.sg/favicon.ico",
"http://rednano.sg/sfe/lwi.action?querystring={searchTerms}",
"UTF-8",
@@ -1407,6 +1628,8 @@ const PrepopulatedEngine rednano = {
const PrepopulatedEngine sanook = {
L"\x0e2a\x0e19\x0e38\x0e01!",
L"sanook.com",
+ NULL,
+ NULL,
"http://search.sanook.com/favicon.ico",
"http://search.sanook.com/search.php?q={searchTerms}",
"UTF-8",
@@ -1419,6 +1642,8 @@ const PrepopulatedEngine sanook = {
const PrepopulatedEngine sapo = {
L"SAPO",
L"sapo.pt",
+ NULL,
+ NULL,
"http://imgs.sapo.pt/images/sapo.ico",
"http://pesquisa.sapo.pt/?q={searchTerms}",
"UTF-8",
@@ -1431,6 +1656,8 @@ const PrepopulatedEngine sapo = {
const PrepopulatedEngine search_de_CH = {
L"search.ch",
L"search.ch",
+ NULL,
+ NULL,
"http://www.search.ch/favicon.ico",
"http://www.search.ch/index.de.html?q={searchTerms}",
"ISO-8859-1",
@@ -1443,6 +1670,8 @@ const PrepopulatedEngine search_de_CH = {
const PrepopulatedEngine search_fr_CH = {
L"search.ch",
L"search.ch_", // search.ch is taken by search_de_CH.
+ NULL,
+ NULL,
"http://www.search.ch/favicon.ico",
"http://www.search.ch/index.fr.html?q={searchTerms}",
"ISO-8859-1",
@@ -1455,6 +1684,8 @@ const PrepopulatedEngine search_fr_CH = {
const PrepopulatedEngine seznam = {
L"Seznam",
L"seznam.cz",
+ NULL,
+ NULL,
"http://1.im.cz/szn/img/favicon.ico",
"http://search.seznam.cz/?q={searchTerms}",
"UTF-8",
@@ -1468,6 +1699,8 @@ const PrepopulatedEngine seznam = {
const PrepopulatedEngine terra_ar = {
L"Terra Argentina",
L"terra.com.ar",
+ NULL,
+ NULL,
"http://buscar.terra.com.ar/favicon.ico",
"http://buscar.terra.com.ar/Default.aspx?query={searchTerms}&source=Search",
"ISO-8859-1",
@@ -1480,6 +1713,8 @@ const PrepopulatedEngine terra_ar = {
const PrepopulatedEngine terra_es = {
L"Terra",
L"terra.es",
+ NULL,
+ NULL,
"http://buscador.terra.es/favicon.ico",
"http://buscador.terra.es/Default.aspx?query={searchTerms}&source=Search",
"ISO-8859-1",
@@ -1492,6 +1727,8 @@ const PrepopulatedEngine terra_es = {
const PrepopulatedEngine tut = {
L"TUT.BY",
L"tut.by",
+ NULL,
+ NULL,
"http://www.tut.by/favicon.ico",
"http://search.tut.by/?query={searchTerms}",
"windows-1251",
@@ -1504,6 +1741,8 @@ const PrepopulatedEngine tut = {
const PrepopulatedEngine uol = {
L"UOL Busca",
L"busca.uol.com.br",
+ NULL,
+ NULL,
"http://busca.uol.com.br/favicon.ico",
"http://busca.uol.com.br/www/index.html?q={searchTerms}",
"ISO-8859-1",
@@ -1516,6 +1755,8 @@ const PrepopulatedEngine uol = {
const PrepopulatedEngine virgilio = {
L"Virgilio",
L"virgilio.it",
+ NULL,
+ NULL,
"http://ricerca.alice.it/favicon.ico",
"http://ricerca.alice.it/ricerca?qs={searchTerms}",
"ISO-8859-1",
@@ -1528,6 +1769,8 @@ const PrepopulatedEngine virgilio = {
const PrepopulatedEngine walla = {
L"\x05d5\x05d5\x05d0\x05dc\x05d4!",
L"walla.co.il",
+ NULL,
+ NULL,
"http://www.walla.co.il/favicon.ico",
"http://search.walla.co.il/?e=hew&q={searchTerms}",
"windows-1255",
@@ -1540,6 +1783,8 @@ const PrepopulatedEngine walla = {
const PrepopulatedEngine wp = {
L"Wirtualna Polska",
L"wp.pl",
+ NULL,
+ NULL,
"http://szukaj.wp.pl/favicon.ico",
"http://szukaj.wp.pl/szukaj.html?szukaj={searchTerms}",
"ISO-8859-2",
@@ -1552,6 +1797,8 @@ const PrepopulatedEngine wp = {
const PrepopulatedEngine yahoo = {
L"Yahoo!",
L"yahoo.com",
+ NULL,
+ NULL,
"http://search.yahoo.com/favicon.ico",
"http://search.yahoo.com/search?ei={inputEncoding}&fr=crmas&p={searchTerms}",
"UTF-8",
@@ -1567,6 +1814,8 @@ const PrepopulatedEngine yahoo = {
const PrepopulatedEngine yahoo_ar = {
L"Yahoo! Argentina",
L"ar.yahoo.com",
+ NULL,
+ NULL,
"http://ar.search.yahoo.com/favicon.ico",
"http://ar.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1581,6 +1830,8 @@ const PrepopulatedEngine yahoo_ar = {
const PrepopulatedEngine yahoo_at = {
L"Yahoo! Suche",
L"at.yahoo.com",
+ NULL,
+ NULL,
"http://at.search.yahoo.com/favicon.ico",
"http://at.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1594,6 +1845,8 @@ const PrepopulatedEngine yahoo_at = {
const PrepopulatedEngine yahoo_au = {
L"Yahoo!7",
L"au.yahoo.com",
+ NULL,
+ NULL,
"http://au.search.yahoo.com/favicon.ico",
"http://au.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1608,6 +1861,8 @@ const PrepopulatedEngine yahoo_au = {
const PrepopulatedEngine yahoo_br = {
L"Yahoo! Brasil",
L"br.yahoo.com",
+ NULL,
+ NULL,
"http://br.search.yahoo.com/favicon.ico",
"http://br.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1622,6 +1877,8 @@ const PrepopulatedEngine yahoo_br = {
const PrepopulatedEngine yahoo_ca = {
L"Yahoo! Canada",
L"ca.yahoo.com",
+ NULL,
+ NULL,
"http://ca.search.yahoo.com/favicon.ico",
"http://ca.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1636,6 +1893,8 @@ const PrepopulatedEngine yahoo_ca = {
const PrepopulatedEngine yahoo_ch = {
L"Yahoo! Suche",
L"ch.yahoo.com",
+ NULL,
+ NULL,
"http://ch.search.yahoo.com/favicon.ico",
"http://ch.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1649,6 +1908,8 @@ const PrepopulatedEngine yahoo_ch = {
const PrepopulatedEngine yahoo_cl = {
L"Yahoo! Chile",
L"cl.yahoo.com",
+ NULL,
+ NULL,
"http://cl.search.yahoo.com/favicon.ico",
"http://cl.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1663,6 +1924,8 @@ const PrepopulatedEngine yahoo_cl = {
const PrepopulatedEngine yahoo_cn = {
L"\x4e2d\x56fd\x96c5\x864e",
L"cn.yahoo.com",
+ NULL,
+ NULL,
"http://search.cn.yahoo.com/favicon.ico",
"http://search.cn.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1676,6 +1939,8 @@ const PrepopulatedEngine yahoo_cn = {
const PrepopulatedEngine yahoo_co = {
L"Yahoo! Colombia",
L"co.yahoo.com",
+ NULL,
+ NULL,
"http://co.search.yahoo.com/favicon.ico",
"http://co.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1690,6 +1955,8 @@ const PrepopulatedEngine yahoo_co = {
const PrepopulatedEngine yahoo_de = {
L"Yahoo! Deutschland",
L"de.yahoo.com",
+ NULL,
+ NULL,
"http://de.search.yahoo.com/favicon.ico",
"http://de.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1704,6 +1971,8 @@ const PrepopulatedEngine yahoo_de = {
const PrepopulatedEngine yahoo_dk = {
L"Yahoo! Danmark",
L"dk.yahoo.com",
+ NULL,
+ NULL,
"http://dk.search.yahoo.com/favicon.ico",
"http://dk.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1717,6 +1986,8 @@ const PrepopulatedEngine yahoo_dk = {
const PrepopulatedEngine yahoo_es = {
L"Yahoo! Espa" L"\x00f1" L"a",
L"es.yahoo.com",
+ NULL,
+ NULL,
"http://es.search.yahoo.com/favicon.ico",
"http://es.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1731,6 +2002,8 @@ const PrepopulatedEngine yahoo_es = {
const PrepopulatedEngine yahoo_fi = {
L"Yahoo!-haku",
L"fi.yahoo.com",
+ NULL,
+ NULL,
"http://fi.search.yahoo.com/favicon.ico",
"http://fi.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1744,6 +2017,8 @@ const PrepopulatedEngine yahoo_fi = {
const PrepopulatedEngine yahoo_fr = {
L"Yahoo! France",
L"fr.yahoo.com",
+ NULL,
+ NULL,
"http://fr.search.yahoo.com/favicon.ico",
"http://fr.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1758,6 +2033,8 @@ const PrepopulatedEngine yahoo_fr = {
const PrepopulatedEngine yahoo_hk = {
L"Yahoo! Hong Kong",
L"hk.yahoo.com",
+ NULL,
+ NULL,
"http://hk.search.yahoo.com/favicon.ico",
"http://hk.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1771,6 +2048,8 @@ const PrepopulatedEngine yahoo_hk = {
const PrepopulatedEngine yahoo_id = {
L"Yahoo! Indonesia",
L"id.yahoo.com",
+ NULL,
+ NULL,
"http://id.search.yahoo.com/favicon.ico",
"http://id.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1785,6 +2064,8 @@ const PrepopulatedEngine yahoo_id = {
const PrepopulatedEngine yahoo_in = {
L"Yahoo! India",
L"in.yahoo.com",
+ NULL,
+ NULL,
"http://in.search.yahoo.com/favicon.ico",
"http://in.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1799,6 +2080,8 @@ const PrepopulatedEngine yahoo_in = {
const PrepopulatedEngine yahoo_it = {
L"Yahoo! Italia",
L"it.yahoo.com",
+ NULL,
+ NULL,
"http://it.search.yahoo.com/favicon.ico",
"http://it.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1813,6 +2096,8 @@ const PrepopulatedEngine yahoo_it = {
const PrepopulatedEngine yahoo_jp = {
L"Yahoo! JAPAN",
L"yahoo.co.jp",
+ NULL,
+ NULL,
"http://search.yahoo.co.jp/favicon.ico",
"http://search.yahoo.co.jp/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1826,6 +2111,8 @@ const PrepopulatedEngine yahoo_jp = {
const PrepopulatedEngine yahoo_kr = {
L"\xc57c\xd6c4! \xcf54\xb9ac\xc544",
L"kr.yahoo.com",
+ NULL,
+ NULL,
"http://kr.search.yahoo.com/favicon.ico",
"http://kr.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1840,6 +2127,8 @@ const PrepopulatedEngine yahoo_kr = {
const PrepopulatedEngine yahoo_malaysia = {
L"Yahoo! Malaysia",
L"malaysia.yahoo.com",
+ NULL,
+ NULL,
"http://malaysia.search.yahoo.com/favicon.ico",
"http://malaysia.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1854,6 +2143,8 @@ const PrepopulatedEngine yahoo_malaysia = {
const PrepopulatedEngine yahoo_mx = {
L"Yahoo! M\x00e9xico",
L"mx.yahoo.com",
+ NULL,
+ NULL,
"http://mx.search.yahoo.com/favicon.ico",
"http://mx.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1868,6 +2159,8 @@ const PrepopulatedEngine yahoo_mx = {
const PrepopulatedEngine yahoo_nl = {
L"Yahoo! Nederland",
L"nl.yahoo.com",
+ NULL,
+ NULL,
"http://nl.search.yahoo.com/favicon.ico",
"http://nl.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1881,6 +2174,8 @@ const PrepopulatedEngine yahoo_nl = {
const PrepopulatedEngine yahoo_no = {
L"Yahoo! Norge",
L"no.yahoo.com",
+ NULL,
+ NULL,
"http://no.search.yahoo.com/favicon.ico",
"http://no.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1894,6 +2189,8 @@ const PrepopulatedEngine yahoo_no = {
const PrepopulatedEngine yahoo_nz = {
L"Yahoo!Xtra",
L"nz.yahoo.com",
+ NULL,
+ NULL,
"http://nz.search.yahoo.com/favicon.ico",
"http://nz.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1908,6 +2205,8 @@ const PrepopulatedEngine yahoo_nz = {
const PrepopulatedEngine yahoo_pe = {
L"Yahoo! Per\x00fa",
L"pe.yahoo.com",
+ NULL,
+ NULL,
"http://pe.search.yahoo.com/favicon.ico",
"http://pe.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1922,6 +2221,8 @@ const PrepopulatedEngine yahoo_pe = {
const PrepopulatedEngine yahoo_ph = {
L"Yahoo! Philippines",
L"ph.yahoo.com",
+ NULL,
+ NULL,
"http://ph.search.yahoo.com/favicon.ico",
"http://ph.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1936,6 +2237,8 @@ const PrepopulatedEngine yahoo_ph = {
const PrepopulatedEngine yahoo_qc = {
L"Yahoo! Qu" L"\x00e9" L"bec",
L"qc.yahoo.com",
+ NULL,
+ NULL,
"http://qc.search.yahoo.com/favicon.ico",
"http://qc.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1949,6 +2252,8 @@ const PrepopulatedEngine yahoo_qc = {
const PrepopulatedEngine yahoo_ru = {
L"Yahoo! \x043f\x043e-\x0440\x0443\x0441\x0441\x043a\x0438",
L"ru.yahoo.com",
+ NULL,
+ NULL,
"http://ru.search.yahoo.com/favicon.ico",
"http://ru.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1962,6 +2267,8 @@ const PrepopulatedEngine yahoo_ru = {
const PrepopulatedEngine yahoo_se = {
L"Yahoo! Sverige",
L"se.yahoo.com",
+ NULL,
+ NULL,
"http://se.search.yahoo.com/favicon.ico",
"http://se.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1975,6 +2282,8 @@ const PrepopulatedEngine yahoo_se = {
const PrepopulatedEngine yahoo_sg = {
L"Yahoo! Singapore",
L"sg.yahoo.com",
+ NULL,
+ NULL,
"http://sg.search.yahoo.com/favicon.ico",
"http://sg.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -1989,6 +2298,8 @@ const PrepopulatedEngine yahoo_sg = {
const PrepopulatedEngine yahoo_th = {
L"Yahoo! \x0e1b\x0e23\x0e30\x0e40\x0e17\x0e28\x0e44\x0e17\x0e22",
L"th.yahoo.com",
+ NULL,
+ NULL,
"http://th.search.yahoo.com/favicon.ico",
"http://th.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -2003,6 +2314,8 @@ const PrepopulatedEngine yahoo_th = {
const PrepopulatedEngine yahoo_tw = {
L"Yahoo!\x5947\x6469",
L"tw.yahoo.com",
+ NULL,
+ NULL,
"http://tw.search.yahoo.com/favicon.ico",
"http://tw.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -2016,6 +2329,8 @@ const PrepopulatedEngine yahoo_tw = {
const PrepopulatedEngine yahoo_uk = {
L"Yahoo! UK & Ireland",
L"uk.yahoo.com",
+ NULL,
+ NULL,
"http://uk.search.yahoo.com/favicon.ico",
"http://uk.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -2030,6 +2345,8 @@ const PrepopulatedEngine yahoo_uk = {
const PrepopulatedEngine yahoo_ve = {
L"Yahoo! Venezuela",
L"ve.yahoo.com",
+ NULL,
+ NULL,
"http://ve.search.yahoo.com/favicon.ico",
"http://ve.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -2044,6 +2361,8 @@ const PrepopulatedEngine yahoo_ve = {
const PrepopulatedEngine yahoo_vn = {
L"Yahoo! Vi\x1ec7t Nam",
L"vn.yahoo.com",
+ NULL,
+ NULL,
"http://vn.search.yahoo.com/favicon.ico",
"http://vn.search.yahoo.com/search?ei={inputEncoding}&fr=crmas&"
"p={searchTerms}",
@@ -2058,6 +2377,8 @@ const PrepopulatedEngine yahoo_vn = {
const PrepopulatedEngine yamli = {
L"Yamli",
L"yamli.com",
+ NULL,
+ NULL,
"http://www.yamli.com/favicon.ico",
"http://www.yamli.com/#q={searchTerms}",
"UTF-8",
@@ -2070,6 +2391,8 @@ const PrepopulatedEngine yamli = {
const PrepopulatedEngine yandex_ru = {
L"\x042f\x043d\x0434\x0435\x043a\x0441",
L"yandex.ru",
+ NULL,
+ NULL,
"http://yandex.ru/favicon.ico",
"http://yandex.ru/yandsearch?text={searchTerms}",
"UTF-8",
@@ -2082,6 +2405,8 @@ const PrepopulatedEngine yandex_ru = {
const PrepopulatedEngine yandex_ua = {
L"\x042f\x043d\x0434\x0435\x043a\x0441",
L"yandex.ua",
+ NULL,
+ NULL,
"http://yandex.ua/favicon.ico",
"http://yandex.ua/yandsearch?text={searchTerms}",
"UTF-8",
@@ -2094,6 +2419,8 @@ const PrepopulatedEngine yandex_ua = {
const PrepopulatedEngine zoznam = {
L"Zoznam",
L"zoznam.sk",
+ NULL,
+ NULL,
"http://zoznam.sk/favicon.ico",
"http://zoznam.sk/hladaj.fcgi?s={searchTerms}",
"windows-1250",
@@ -2113,6 +2440,8 @@ const PrepopulatedEngine all_by = {
L"ALL.BY",
L"all.by",
NULL,
+ NULL,
+ NULL,
"http://www.all.by/cgi-bin/search.cgi?mode=by&query={searchTerms}",
"UTF-8",
NULL,
@@ -2125,6 +2454,8 @@ const PrepopulatedEngine aport = {
L"Aport",
L"aport.ru",
NULL,
+ NULL,
+ NULL,
"http://www.aport.ru/search/?r={searchTerms}",
"UTF-8",
NULL,
@@ -2137,6 +2468,8 @@ const PrepopulatedEngine avg = {
L"AVG Secure Search",
L"search.avg.com",
NULL,
+ NULL,
+ NULL,
"http://search.avg.com/route/?q={searchTerms}&lng={language}",
"UTF-8",
NULL,
@@ -2149,6 +2482,8 @@ const PrepopulatedEngine avg_i = {
L"AVG Secure Search",
L"isearch.avg.com",
NULL,
+ NULL,
+ NULL,
"http://isearch.avg.com/search?q={searchTerms}&lng={language}",
"UTF-8",
NULL,
@@ -2161,6 +2496,8 @@ const PrepopulatedEngine conduit = {
L"Conduit",
L"conduit.com",
NULL,
+ NULL,
+ NULL,
"http://search.conduit.com/Results.aspx?q={searchTerms}",
"UTF-8",
NULL,
@@ -2173,6 +2510,8 @@ const PrepopulatedEngine icq = {
L"ICQ",
L"icq.com",
NULL,
+ NULL,
+ NULL,
"http://search.icq.com/search/results.php?q={searchTerms}",
"UTF-8",
NULL,
@@ -2185,6 +2524,8 @@ const PrepopulatedEngine meta_ua = {
L"Meta-Ukraine",
L"meta.ua",
NULL,
+ NULL,
+ NULL,
"http://meta.ua/search.asp?q={searchTerms}",
"UTF-8",
NULL,
@@ -2197,6 +2538,8 @@ const PrepopulatedEngine metabot_ru = {
L"Metabot",
L"metabot.ru",
NULL,
+ NULL,
+ NULL,
"http://results.metabot.ru/?st={searchTerms}",
"UTF-8",
NULL,
@@ -2209,6 +2552,8 @@ const PrepopulatedEngine nigma = {
L"Nigma",
L"nigma.ru",
NULL,
+ NULL,
+ NULL,
"http://www.nigma.ru/?s={searchTerms}",
"UTF-8",
NULL,
@@ -2221,6 +2566,8 @@ const PrepopulatedEngine qip = {
L"QIP",
L"qip.ru",
NULL,
+ NULL,
+ NULL,
"http://search.qip.ru/?query={searchTerms}",
"UTF-8",
NULL,
@@ -2233,6 +2580,8 @@ const PrepopulatedEngine ukr_net = {
L"Ukr.net",
L"ukr.net",
NULL,
+ NULL,
+ NULL,
"http://search.ukr.net/google/search.php?q={searchTerms}",
"UTF-8",
NULL,
@@ -2245,6 +2594,8 @@ const PrepopulatedEngine webalta = {
L"Webalta",
L"webalta.ru",
NULL,
+ NULL,
+ NULL,
"http://webalta.ru/search?q={searchTerms}",
"UTF-8",
NULL,
@@ -2256,6 +2607,8 @@ const PrepopulatedEngine webalta = {
const PrepopulatedEngine yandex_tr = {
L"Yandex",
L"yandex.com.tr",
+ NULL,
+ NULL,
"http://yandex.com.tr/favicon.ico",
"http://yandex.com.tr/yandsearch?text={searchTerms}",
"UTF-8",
@@ -3311,28 +3664,33 @@ void RegisterUserPrefs(PrefService* prefs) {
int GetDataVersion(PrefService* prefs) {
// Increment this if you change the above data in ways that mean users with
// existing data should get a new version.
- const int kCurrentDataVersion = 40;
+ const int kCurrentDataVersion = 41;
// Allow tests to override the local version.
return (prefs && prefs->HasPrefPath(prefs::kSearchProviderOverridesVersion)) ?
prefs->GetInteger(prefs::kSearchProviderOverridesVersion) :
kCurrentDataVersion;
}
-TemplateURL* MakePrepopulatedTemplateURL(Profile* profile,
- const string16& name,
- const string16& keyword,
- const base::StringPiece& search_url,
- const base::StringPiece& suggest_url,
- const base::StringPiece& instant_url,
- const base::StringPiece& favicon_url,
- const base::StringPiece& encoding,
- int id) {
+TemplateURL* MakePrepopulatedTemplateURL(
+ Profile* profile,
+ const string16& name,
+ const string16& keyword,
+ const base::StringPiece& search_url,
+ const base::StringPiece& suggest_url,
+ const base::StringPiece& instant_url,
+ const base::StringPiece& logo_100_percent_url,
+ const base::StringPiece& logo_200_percent_url,
+ const base::StringPiece& favicon_url,
+ const base::StringPiece& encoding,
+ int id) {
TemplateURLData data;
data.short_name = name;
data.SetKeyword(keyword);
data.SetURL(search_url.as_string());
data.suggestions_url = suggest_url.as_string();
data.instant_url = instant_url.as_string();
+ data.logo_100_percent_url = GURL(logo_100_percent_url.as_string());
+ data.logo_200_percent_url = GURL(logo_200_percent_url.as_string());
data.favicon_url = GURL(favicon_url.as_string());
data.show_in_default_list = true;
data.safe_for_autoreplace = true;
@@ -3358,6 +3716,8 @@ void GetPrepopulatedTemplateFromPrefs(Profile* profile,
std::string search_url;
std::string suggest_url;
std::string instant_url;
+ std::string logo_100_percent_url;
+ std::string logo_200_percent_url;
std::string favicon_url;
std::string encoding;
int id;
@@ -3372,6 +3732,10 @@ void GetPrepopulatedTemplateFromPrefs(Profile* profile,
engine->Get("search_url", &val) && val->GetAsString(&search_url) &&
engine->Get("suggest_url", &val) && val->GetAsString(&suggest_url) &&
engine->Get("instant_url", &val) && val->GetAsString(&instant_url) &&
+ engine->Get("logo_100_percent_url", &val) &&
+ val->GetAsString(&logo_100_percent_url) &&
+ engine->Get("logo_200_percent_url", &val) &&
+ val->GetAsString(&logo_200_percent_url) &&
engine->Get("favicon_url", &val) && val->GetAsString(&favicon_url) &&
engine->Get("encoding", &val) && val->GetAsString(&encoding) &&
engine->Get("id", &val) && val->GetAsInteger(&id)) {
@@ -3384,7 +3748,8 @@ void GetPrepopulatedTemplateFromPrefs(Profile* profile,
continue;
}
t_urls->push_back(MakePrepopulatedTemplateURL(profile, name, keyword,
- search_url, suggest_url, instant_url, favicon_url, encoding, id));
+ search_url, suggest_url, instant_url, logo_100_percent_url,
+ logo_200_percent_url, favicon_url, encoding, id));
}
}
@@ -3394,7 +3759,9 @@ TemplateURL* MakePrepopulatedTemplateURLFromPrepopulateEngine(
const PrepopulatedEngine& engine) {
return MakePrepopulatedTemplateURL(profile, WideToUTF16(engine.name),
WideToUTF16(engine.keyword), engine.search_url, engine.suggest_url,
- engine.instant_url, engine.favicon_url, engine.encoding, engine.id);
+ engine.instant_url, engine.logo_100_percent_url,
+ engine.logo_200_percent_url, engine.favicon_url, engine.encoding,
+ engine.id);
}
void GetPrepopulatedEngines(Profile* profile,
« chrome/browser/search_engines/template_url.h ('K') | « chrome/browser/search_engines/template_url.h ('k') | chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698