Chromium Browser

Merge lp:~caine/chromium-browser/duckduckgo into lp:~cmiller/chromium-browser/pkg-saucy

  1. duckduckgo
  2. Merge into pkg-saucy
Proposed by caine tighe
Status: Merged
Approved by: Chad Miller
Approved revision: 916
Merge reported by: Chad Miller
Merged at revision: not available
Proposed branch: lp:~caine/chromium-browser/duckduckgo
Merge into: lp:~cmiller/chromium-browser/pkg-saucy
Diff against target: 125 lines (+112/-0)
2 files modified
debian/patches/duckduckgo.patch (+109/-0)
debian/patches/series (+3/-0)
To merge this branch: bzr merge lp:~caine/chromium-browser/duckduckgo
Reviewer Review Type Date Requested Status
Chad Miller Approve
Review via email: mp+182416@code.launchpad.net

Description of the change

Add DuckDuckGo to the end of the default search engine list in Chromium.

To post a comment you must log in.
Revision history for this message
caine tighe (caine) wrote :

This isn't ready to go. I forgot to add it to series and update the paths. Don't waste your time at this point.

lp:~caine/chromium-browser/duckduckgo updated
916. By caine tighe

patches/series
patches/duckduckgo.patch: Add duckduckgo.patch to series and update DuckDuckGo search provider for our major countries.

Revision history for this message
caine tighe (caine) wrote :

This is all ready to go now. Sorry for the confusion. So used to source instead of bzr builddeb :).

Revision history for this message
Chad Miller (cmiller) wrote :

Looks great. Expect to see it in an upcoming release.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/patches/duckduckgo.patch'
2--- debian/patches/duckduckgo.patch 1970-01-01 00:00:00 +0000
3+++ debian/patches/duckduckgo.patch 2013-08-28 15:51:08 +0000
4@@ -0,0 +1,109 @@
5+diff --git a/src/chrome/browser/search_engines/prepopulated_engines.json b/src/chrome/browser/search_engines/prepopulated_engines.json
6+index 150d704..66542ff 100644
7+--- a/src/chrome/browser/search_engines/prepopulated_engines.json
8++++ b/src/chrome/browser/search_engines/prepopulated_engines.json
9+@@ -13,6 +13,7 @@
10+ // 92, 93, 94, 95, 96, 97, 98, 99, 102+
11+ //
12+ // IDs > 1000 are reserved for distribution custom engines.
13++// 1001: DuckDuckGo
14+ //
15+ // NOTES:
16+ // - CHANGE THE ABOVE NUMBERS IF YOU ADD A NEW ENGINE; ID conflicts = bad!
17+@@ -22,11 +23,11 @@
18+ "int_variables": {
19+ // The following id is for UMA stats only. Please update it if you add new
20+ // engines outside the current range or it will not be counted in stats.
21+- "kMaxPrepopulatedEngineID": 101,
22++ "kMaxPrepopulatedEngineID": 1001,
23+
24+ // Increment this if you change the data in ways that mean users with
25+ // existing data should get a new version.
26+- "kCurrentDataVersion": 55
27++ "kCurrentDataVersion": 56
28+ },
29+
30+ // The following engines are included in country lists and are added to the
31+@@ -808,6 +809,16 @@
32+ "id": 32
33+ },
34+
35++ "duckduckgo": {
36++ "name": "DuckDuckGo",
37++ "keyword": "duckduckgo.com",
38++ "favicon_url": "https://duckduckgo.com/favicon.ico",
39++ "search_url": "https://duckduckgo.com/?q={searchTerms}&t=canonical",
40++ "suggest_url": "https://duckduckgo.com/ac/?q={searchTerms}&type=list",
41++ "type": "SEARCH_ENGINE_DUCKDUCKGO",
42++ "id": 1001
43++ },
44++
45+ "eniro_fi": {
46+ "name": "Eniro",
47+ "keyword": "eniro.fi",
48+diff --git a/src/chrome/browser/search_engines/search_engine_type.h b/src/chrome/browser/search_engines/search_engine_type.h
49+index 6aea298..5d26e7a 100644
50+--- a/src/chrome/browser/search_engines/search_engine_type.h
51++++ b/src/chrome/browser/search_engines/search_engine_type.h
52+@@ -27,6 +27,7 @@ enum SearchEngineType {
53+ SEARCH_ENGINE_DAUM,
54+ SEARCH_ENGINE_DELFI,
55+ SEARCH_ENGINE_DIRI,
56++ SEARCH_ENGINE_DUCKDUCKGO,
57+ SEARCH_ENGINE_GOO,
58+ SEARCH_ENGINE_IN,
59+ SEARCH_ENGINE_NAJDI,
60+diff --git a/src/chrome/browser/search_engines/template_url_prepopulate_data.cc b/src/chrome/browser/search_engines/template_url_prepopulate_data.cc
61+index 235f621..e025550 100644
62+--- a/src/chrome/browser/search_engines/template_url_prepopulate_data.cc
63++++ b/src/chrome/browser/search_engines/template_url_prepopulate_data.cc
64+@@ -52,7 +52,7 @@ namespace TemplateURLPrepopulateData {
65+
66+ // Default (for countries with no better engine set)
67+ const PrepopulatedEngine* engines_default[] =
68+- { &google, &yahoo, &bing, };
69++ { &google, &yahoo, &bing, &duckduckgo, };
70+
71+ // United Arab Emirates
72+ const PrepopulatedEngine* engines_AE[] =
73+@@ -145,7 +145,7 @@ const PrepopulatedEngine* engines_CZ[] =
74+
75+ // Germany
76+ const PrepopulatedEngine* engines_DE[] =
77+- { &google, &ask_de, &bing_de_DE, &yahoo_de };
78++ { &google, &ask_de, &bing_de_DE, &yahoo_de, &duckduckgo, };
79+
80+ // Denmark
81+ const PrepopulatedEngine* engines_DK[] =
82+@@ -185,11 +185,11 @@ const PrepopulatedEngine* engines_FI[] =
83+
84+ // France
85+ const PrepopulatedEngine* engines_FR[] =
86+- { &google, &yahoo_fr, &bing_fr_FR, };
87++ { &google, &yahoo_fr, &bing_fr_FR, &duckduckgo, };
88+
89+ // United Kingdom
90+ const PrepopulatedEngine* engines_GB[] =
91+- { &google, &ask_uk, &yahoo_uk, &bing_en_GB, };
92++ { &google, &ask_uk, &yahoo_uk, &bing_en_GB, &duckduckgo, };
93+
94+ // Greece
95+ const PrepopulatedEngine* engines_GR[] =
96+@@ -457,7 +457,7 @@ const PrepopulatedEngine* engines_UA[] =
97+
98+ // United States
99+ const PrepopulatedEngine* engines_US[] =
100+- { &google, &yahoo, &bing_en_US, };
101++ { &google, &yahoo, &bing_en_US, &duckduckgo, };
102+
103+ // Uruguay
104+ const PrepopulatedEngine* engines_UY[] =
105+@@ -501,7 +501,7 @@ const PrepopulatedEngine* kAllEngines[] =
106+ &bing_pt_PT, &bing_ro_RO, &bing_ru_RU, &bing_sl_SI, &bing_sk_SK,
107+ &bing_sv_SE, &bing_th_TH, &bing_tr_TR, &bing_uk_UA, &bing_zh_CN,
108+ &bing_zh_HK, &bing_zh_TW, &centrum_cz, &centrum_sk, &daum, &delfi_lt,
109+- &delfi_lv, &diri, &eniro_fi, &eniro_se, &fonecta_02_fi, &goo, &google,
110++ &delfi_lv, &diri, &duckduckgo, &eniro_fi, &eniro_se, &fonecta_02_fi, &goo, &google,
111+ &guruji, &hispavista, &in, &jabse, &jubii, &kvasir, &latne, &leit,
112+ &libero, &mail_ru, &maktoob, &masrawy, &mynet, &najdi, &nate, &naver,
113+ &neti, &netsprint, &nur_kz, &ok, &onet, &pogodak_rs, &rambler, &rediff,
114
115=== modified file 'debian/patches/series'
116--- debian/patches/series 2013-06-28 19:54:45 +0000
117+++ debian/patches/series 2013-08-28 15:51:08 +0000
118@@ -21,3 +21,6 @@
119 6-passwordless-install-support.patch
120 7-npapi-permission-not-defaults-to-unauthorized.patch
121 ###: end lp:unity-chromium-extension
122+###: start lp:~caine/chromium-browser/duckduckgo
123+duckduckgo.patch
124+###: end lp:~caine/chromium-browser/duckduckgo
125\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: