← Back to branch summary

~chromium-team/chromium-browser/disco-beta

« back to all changes in this revision

Viewing changes to debian/patches/search-credit.patch

  • Committer: Olivier Tilloy
  • Date: 2019-02-08 23:09:16 UTC
  • mfrom: (1358.1.128 disco-dev)
  • Revision ID: olivier.tilloy@canonical.com-20190208230916-fw5rl1swl7hxx4u0
* Upstream beta channel update: 73.0.3683.27
* debian/patches/additional-search-engines.patch: removed, no longer needed
* debian/patches/configuration-directory.patch: refreshed
* debian/patches/disable-sse2: refreshed
* debian/patches/fix-extra-arflags.patch: refreshed
* debian/patches/fix-ffmpeg-ia32-build.patch: refreshed
* debian/patches/gn-do-not-build-with-icf.patch: removed, no longer needed
* debian/patches/revert-Xclang-instcombine-lower-dbg-declare.patch: refreshed
* debian/patches/search-credit.patch: updated
* debian/patches/set-rpath-on-chromium-executables.patch: refreshed
* debian/patches/title-bar-default-system.patch-v35: refreshed
* debian/patches/widevine-enable-version-string.patch: refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/search-credit.patch
3
3
 
4
4
--- a/components/search_engines/prepopulated_engines.json
5
5
+++ b/components/search_engines/prepopulated_engines.json
6
 
@@ -85,7 +85,7 @@
 
6
@@ -52,7 +52,7 @@
7
7
       "name": "\u767e\u5ea6",
8
8
       "keyword": "baidu.com",
9
9
       "favicon_url": "https://www.baidu.com/favicon.ico",
12
12
       "alternate_urls": [
13
13
         "https://www.baidu.com/s?ie={inputEncoding}&wd={searchTerms}",
14
14
         "https://www.baidu.com/s?ie={inputEncoding}&word={searchTerms}",
 
15
@@ -99,7 +99,7 @@
 
16
       "name": "DuckDuckGo",
 
17
       "keyword": "duckduckgo.com",
 
18
       "favicon_url": "https://duckduckgo.com/favicon.ico",
 
19
-      "search_url": "https://duckduckgo.com/?q={searchTerms}",
 
20
+      "search_url": "https://duckduckgo.com/?q={searchTerms}&t=canonical",
 
21
       "suggest_url": "https://duckduckgo.com/ac/?q={searchTerms}&type=list",
 
22
       "type": "SEARCH_ENGINE_DUCKDUCKGO",
 
23
       "id": 92
15
24
--- a/components/search_engines/template_url.cc
16
25
+++ b/components/search_engines/template_url.cc
17
 
@@ -950,6 +950,9 @@ std::string TemplateURLRef::HandleReplac
 
26
@@ -949,6 +949,9 @@ std::string TemplateURLRef::HandleReplac
18
27
 
19
28
   std::string url = parsed_url_;
20
29
 
24
33
   // replacements_ is ordered in ascending order, as such we need to iterate
25
34
   // from the back.
26
35
   for (auto i = replacements_.rbegin(); i != replacements_.rend(); ++i) {
27
 
@@ -978,6 +981,7 @@ std::string TemplateURLRef::HandleReplac
 
36
@@ -977,6 +980,7 @@ std::string TemplateURLRef::HandleReplac
28
37
 
29
38
       case GOOGLE_BASE_URL:
30
39
         DCHECK(!i->is_post_param);
32
41
         HandleReplacement(
33
42
             std::string(), search_terms_data.GoogleBaseURLValue(), *i, &url);
34
43
         break;
35
 
@@ -1096,7 +1100,8 @@ std::string TemplateURLRef::HandleReplac
 
44
@@ -1095,7 +1099,8 @@ std::string TemplateURLRef::HandleReplac
36
45
 
37
46
       case GOOGLE_SEARCH_CLIENT: {
38
47
         DCHECK(!i->is_post_param);
42
51
         if (!client.empty())
43
52
           HandleReplacement("client", client, *i, &url);
44
53
         break;
45
 
@@ -1215,6 +1220,13 @@ std::string TemplateURLRef::HandleReplac
 
54
@@ -1214,6 +1219,13 @@ std::string TemplateURLRef::HandleReplac
46
55
     }
47
56
   }
48
57