summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/template_url_prepopulate_data.cc131
1 files changed, 86 insertions, 45 deletions
diff --git a/chrome/browser/template_url_prepopulate_data.cc b/chrome/browser/template_url_prepopulate_data.cc
index b57f1d6..d1e481e 100644
--- a/chrome/browser/template_url_prepopulate_data.cc
+++ b/chrome/browser/template_url_prepopulate_data.cc
@@ -331,7 +331,11 @@ const PrepopulatedEngine daum = {
L"http://search.daum.net/favicon.ico",
L"http://search.daum.net/search?q={searchTerms}",
"EUC-KR",
- L"http://sug.search.daum.net/search_nsuggest?mod=fxjson&q={searchTerms}",
+ // Response is in EUC-KR and is labelled as such in HTTP C-T header.
+ // L"http://sug.search.daum.net/search_nsuggest?mod=fxjson&q={searchTerms}",
+ // Until http://b/1293145 is fixed or we figure out how to get responses
+ // in UTF-8, disable it.
+ NULL,
68,
};
@@ -381,6 +385,9 @@ const PrepopulatedEngine empas = {
L"http://search.empas.com/favicon.ico",
L"http://search.empas.com/search/all.html?q={searchTerms}",
"EUC-KR",
+ // http://www.empas.com/ac/do.tsp?q={searchTerms}
+ // returns non-Firefox JSON. searchTerms needs to be in Java notation
+ // (\uAC00\uAC01).
NULL,
70,
};
@@ -892,7 +899,7 @@ const PrepopulatedEngine meta = {
L"http://meta.ua/favicon.ico",
L"http://meta.ua/search.asp?q={searchTerms}",
"windows-1251",
- L"http://meta.ua/suggestions/?output=fxjson&q={searchTerms}",
+ L"http://meta.ua/suggestions/?output=fxjson&oe=utf-8&q={searchTerms}",
102,
};
@@ -1333,9 +1340,10 @@ const PrepopulatedEngine naver = {
L"\xb124\xc774\xbc84",
L"naver.com",
L"http://search.naver.com/favicon.ico",
- L"http://search.naver.com/search.naver?query={searchTerms}",
- "EUC-KR",
- L"http://ac.search.naver.com/autocompl?m=s&ie={inputEncoding}&"
+ L"http://search.naver.com/search.naver?ie={inputEncoding}"
+ L"&query={searchTerms}",
+ "UTF-8",
+ L"http://ac.search.naver.com/autocompl?m=s&ie={inputEncoding}&oe=utf-8&"
L"q={searchTerms}",
67,
};
@@ -1792,13 +1800,17 @@ const PrepopulatedEngine yahoo = {
2,
};
+// For regional Yahoo variants without region-specific suggestion service,
+// suggestion is disabled. For some of them, we might consider
+// using a fallback (e.g. de for at/ch, ca or fr for qc, en for nl, no, hk).
const PrepopulatedEngine yahoo_ar = {
L"Yahoo! Argentina",
L"ar.yahoo.com",
L"http://ar.search.yahoo.com/favicon.ico",
L"http://ar.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://ar-sayt.ff.search.yahoo.com/gossip-ar-sayt?command={searchTerms}&"
+ L"output=fxjson",
2,
};
@@ -1808,7 +1820,7 @@ const PrepopulatedEngine yahoo_at = {
L"http://at.search.yahoo.com/favicon.ico",
L"http://at.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ NULL,
2,
};
@@ -1818,7 +1830,8 @@ const PrepopulatedEngine yahoo_au = {
L"http://au.search.yahoo.com/favicon.ico",
L"http://au.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://aue-sayt.ff.search.yahoo.com/gossip-au-sayt?command={searchTerms}&"
+ L"output=fxjson",
2,
};
@@ -1828,7 +1841,8 @@ const PrepopulatedEngine yahoo_br = {
L"http://br.search.yahoo.com/favicon.ico",
L"http://br.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://br-sayt.ff.search.yahoo.com/gossip-br-sayt?command={searchTerms}&"
+ L"output=fxjson",
2,
};
@@ -1838,7 +1852,8 @@ const PrepopulatedEngine yahoo_ca = {
L"http://ca.search.yahoo.com/favicon.ico",
L"http://ca.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://gossip.ca.yahoo.com/gossip-ca-sayt?output=fxjsonp&"
+ L"command={searchTerms}",
2,
};
@@ -1848,7 +1863,7 @@ const PrepopulatedEngine yahoo_ch = {
L"http://ch.search.yahoo.com/favicon.ico",
L"http://ch.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ NULL,
2,
};
@@ -1858,7 +1873,8 @@ const PrepopulatedEngine yahoo_cl = {
L"http://cl.search.yahoo.com/favicon.ico",
L"http://cl.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://gossip.telemundo.yahoo.com/gossip-e1-sayt?output=fxjson&"
+ L"command={searchTerms}",
2,
};
@@ -1868,7 +1884,9 @@ const PrepopulatedEngine yahoo_cn = {
L"http://search.cn.yahoo.com/favicon.ico",
L"http://search.cn.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"GB2312",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ // http://cn.yahoo.com/cnsuggestion/suggestion.inc.php?of=fxjson&query=
+ // returns in a proprietary format ('|' delimeted word list).
+ NULL,
2,
};
@@ -1878,7 +1896,8 @@ const PrepopulatedEngine yahoo_co = {
L"http://co.search.yahoo.com/favicon.ico",
L"http://co.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://gossip.telemundo.yahoo.com/gossip-e1-sayt?output=fxjson&"
+ L"command={searchTerms}",
2,
};
@@ -1888,7 +1907,8 @@ const PrepopulatedEngine yahoo_de = {
L"http://de.search.yahoo.com/favicon.ico",
L"http://de.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://de-sayt.ff.search.yahoo.com/gossip-de-sayt?command={searchTerms}&"
+ L"output=fxjson",
2,
};
@@ -1898,7 +1918,7 @@ const PrepopulatedEngine yahoo_dk = {
L"http://dk.search.yahoo.com/favicon.ico",
L"http://dk.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ NULL,
2,
};
@@ -1908,7 +1928,8 @@ const PrepopulatedEngine yahoo_es = {
L"http://es.search.yahoo.com/favicon.ico",
L"http://es.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://es-sayt.ff.search.yahoo.com/gossip-es-sayt?command={searchTerms}&"
+ L"output=fxjson",
2,
};
@@ -1918,7 +1939,7 @@ const PrepopulatedEngine yahoo_fi = {
L"http://fi.search.yahoo.com/favicon.ico",
L"http://fi.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ NULL,
2,
};
@@ -1928,7 +1949,8 @@ const PrepopulatedEngine yahoo_fr = {
L"http://fr.search.yahoo.com/favicon.ico",
L"http://fr.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://fr-sayt.ff.search.yahoo.com/gossip-fr-sayt?command={searchTerms}&"
+ L"output=fxjson",
2,
};
@@ -1938,7 +1960,10 @@ const PrepopulatedEngine yahoo_hk = {
L"http://hk.search.yahoo.com/favicon.ico",
L"http://hk.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ // http://history.hk.search.yahoo.com/ac/ac_msearch.php?query={searchTerms}
+ // returns a JSON with key-value pairs. Setting parameters (ot, of, output)
+ // to fxjson,json, or js doesn't help.
+ NULL,
2,
};
@@ -1948,7 +1973,8 @@ const PrepopulatedEngine yahoo_id = {
L"http://id.search.yahoo.com/favicon.ico",
L"http://id.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://id-sayt.ff.search.yahoo.com/gossip-id-sayt?command={searchTerms}&"
+ L"output=fxjson",
2,
};
@@ -1958,7 +1984,8 @@ const PrepopulatedEngine yahoo_in = {
L"http://in.search.yahoo.com/favicon.ico",
L"http://in.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://in-sayt.ff.search.yahoo.com/gossip-in-sayt?command={searchTerms}&"
+ L"output=fxjson",
2,
};
@@ -1968,7 +1995,8 @@ const PrepopulatedEngine yahoo_it = {
L"http://it.search.yahoo.com/favicon.ico",
L"http://it.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://it-sayt.ff.search.yahoo.com/gossip-it-sayt?command={searchTerms}&"
+ L"output=fxjson",
2,
};
@@ -1978,7 +2006,7 @@ const PrepopulatedEngine yahoo_jp = {
L"http://search.yahoo.co.jp/favicon.ico",
L"http://search.yahoo.co.jp/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ NULL,
2,
};
@@ -1988,7 +2016,8 @@ const PrepopulatedEngine yahoo_kr = {
L"http://kr.search.yahoo.com/favicon.ico",
L"http://kr.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://kr.atc.search.yahoo.com/atcx.php?property=main&ot=fxjson"
+ L"&ei=utf8&eo=utf8&command={searchTerms}",
2,
};
@@ -1999,7 +2028,8 @@ const PrepopulatedEngine yahoo_malaysia = {
L"http://malaysia.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://my-sayt.ff.search.yahoo.com/gossip-my-sayt?command={searchTerms}&"
+ L"output=fxjson",
2,
};
@@ -2009,7 +2039,8 @@ const PrepopulatedEngine yahoo_mx = {
L"http://mx.search.yahoo.com/favicon.ico",
L"http://mx.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://gossip.mx.yahoo.com/gossip-mx-sayt?output=fxjsonp&"
+ L"command={searchTerms}",
2,
};
@@ -2019,7 +2050,7 @@ const PrepopulatedEngine yahoo_nl = {
L"http://nl.search.yahoo.com/favicon.ico",
L"http://nl.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ NULL,
2,
};
@@ -2029,17 +2060,18 @@ const PrepopulatedEngine yahoo_no = {
L"http://no.search.yahoo.com/favicon.ico",
L"http://no.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ NULL,
2,
};
const PrepopulatedEngine yahoo_nz = {
L"Yahoo!Xtra",
L"nz.yahoo.com",
- L"http://sg.search.yahoo.com/favicon.ico",
- L"http://sg.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
+ L"http://nz.search.yahoo.com/favicon.ico",
+ L"http://nz.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://aue-sayt.ff.search.yahoo.com/gossip-nz-sayt?command={searchTerms}&"
+ L"output=fxjson",
2,
};
@@ -2049,7 +2081,8 @@ const PrepopulatedEngine yahoo_pe = {
L"http://pe.search.yahoo.com/favicon.ico",
L"http://pe.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://gossip.telemundo.yahoo.com/gossip-e1-sayt?output=fxjson&"
+ L"command={searchTerms}",
2,
};
@@ -2059,7 +2092,8 @@ const PrepopulatedEngine yahoo_ph = {
L"http://ph.search.yahoo.com/favicon.ico",
L"http://ph.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://ph-sayt.ff.search.yahoo.com/gossip-ph-sayt?command={searchTerms}&"
+ L"output=fxjson",
2,
};
@@ -2069,7 +2103,7 @@ const PrepopulatedEngine yahoo_qc = {
L"http://qc.search.yahoo.com/favicon.ico",
L"http://qc.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ NULL,
5, // Can't be 2 as this has to appear in the Canada list alongside yahoo_ca.
};
@@ -2079,17 +2113,18 @@ const PrepopulatedEngine yahoo_ru = {
L"http://ru.search.yahoo.com/favicon.ico",
L"http://ru.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ NULL,
2,
};
const PrepopulatedEngine yahoo_sg = {
L"Yahoo! Singapore",
L"sg.yahoo.com",
- L"http://tw.search.yahoo.com/favicon.ico",
- L"http://tw.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
+ L"http://sg.search.yahoo.com/favicon.ico",
+ L"http://sg.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://sg-sayt.ff.search.yahoo.com/gossip-sg-sayt?output=fxjson&"
+ L"command={searchTerms}",
2,
};
@@ -2099,7 +2134,8 @@ const PrepopulatedEngine yahoo_th = {
L"http://th.search.yahoo.com/favicon.ico",
L"http://th.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://th-sayt.ff.search.yahoo.com/gossip-th-sayt?output=fxjson&"
+ L"command={searchTerms}",
2,
};
@@ -2109,7 +2145,9 @@ const PrepopulatedEngine yahoo_tw = {
L"http://tw.search.yahoo.com/favicon.ico",
L"http://tw.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ // "http://tw.yahoo.com/ac/ac_search.php?eo=utf8&of=js&prop=web&query="
+ // returns a JSON file prepended with 'fxjson={'.
+ NULL,
2,
};
@@ -2119,7 +2157,8 @@ const PrepopulatedEngine yahoo_uk = {
L"http://uk.search.yahoo.com/favicon.ico",
L"http://uk.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://uk-sayt.ff.search.yahoo.com/gossip-uk-sayt?command={searchTerms}&"
+ L"queryfirst=2&output=fxjson",
2,
};
@@ -2129,7 +2168,8 @@ const PrepopulatedEngine yahoo_ve = {
L"http://ve.search.yahoo.com/favicon.ico",
L"http://ve.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://gossip.telemundo.yahoo.com/gossip-e1-sayt?output=fxjson&"
+ L"command={searchTerms}",
2,
};
@@ -2139,7 +2179,8 @@ const PrepopulatedEngine yahoo_vn = {
L"http://vn.search.yahoo.com/favicon.ico",
L"http://vn.search.yahoo.com/search?ei={inputEncoding}&p={searchTerms}",
"UTF-8",
- L"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}",
+ L"http://vn-sayt.ff.search.yahoo.com/gossip-vn-sayt?command={searchTerms}&"
+ L"output=fxjson",
2,
};
@@ -2968,7 +3009,7 @@ void RegisterUserPrefs(PrefService* prefs) {
}
int GetDataVersion() {
- return 11; // Increment this if you change the above data in ways that mean
+ return 12; // Increment this if you change the above data in ways that mean
// users with existing data should get a new version.
}
generated by cgit v1.1 at 2025-03-11 03:47:42 +0000