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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/template_url_prepopulate_data.cc

Issue 463: Merge r1480 into the 149 line to fix some default search engines in ... (Closed) Base URL: svn://chrome-svn/chrome/branches/chrome_official_branch/src/
Patch Set: Created 12 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/template_url_prepopulate_data.cc
===================================================================
--- chrome/browser/template_url_prepopulate_data.cc (revision 1757)
+++ chrome/browser/template_url_prepopulate_data.cc (working copy)
@@ -356,7 +356,11 @@
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,
};
@@ -406,6 +410,9 @@
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,
};
@@ -914,7 +921,7 @@
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,
};
@@ -1355,9 +1362,10 @@
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,
};
@@ -1814,13 +1822,17 @@
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,
};
@@ -1830,7 +1842,7 @@
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,
};
@@ -1840,7 +1852,8 @@
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,
};
@@ -1850,7 +1863,8 @@
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,
};
@@ -1860,7 +1874,8 @@
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,
};
@@ -1870,7 +1885,7 @@
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,
};
@@ -1880,7 +1895,8 @@
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,
};
@@ -1890,7 +1906,9 @@
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,
};
@@ -1900,7 +1918,8 @@
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,
};
@@ -1910,7 +1929,8 @@
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,
};
@@ -1920,7 +1940,7 @@
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,
};
@@ -1930,7 +1950,8 @@
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,
};
@@ -1940,7 +1961,7 @@
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,
};
@@ -1950,7 +1971,8 @@
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,
};
@@ -1960,7 +1982,10 @@
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,
};
@@ -1970,7 +1995,8 @@
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,
};
@@ -1980,7 +2006,8 @@
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,
};
@@ -1990,7 +2017,8 @@
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,
};
@@ -2000,7 +2028,7 @@
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,
};
@@ -2010,7 +2038,8 @@
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,
};
@@ -2021,7 +2050,8 @@
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,
};
@@ -2031,7 +2061,8 @@
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,
};
@@ -2041,7 +2072,7 @@
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,
};
@@ -2051,17 +2082,18 @@
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,
};
@@ -2071,7 +2103,8 @@
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,
};
@@ -2081,7 +2114,8 @@
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,
};
@@ -2091,7 +2125,7 @@
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.
};
@@ -2101,17 +2135,18 @@
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,
};
@@ -2121,7 +2156,8 @@
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,
};
@@ -2131,7 +2167,9 @@
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,
};
@@ -2141,7 +2179,8 @@
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,
};
@@ -2151,7 +2190,8 @@
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,
};
@@ -2161,7 +2201,8 @@
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,
};
@@ -2990,7 +3031,7 @@
}
int GetDataVersion() {
- return 12; // Increment this if you change the above data in ways that mean
+ return 13; // Increment this if you change the above data in ways that mean
// users with existing data should get a new version.
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698