← Back to branch summary

~chromium-team/chromium-browser/artful-beta

« back to all changes in this revision

Viewing changes to debian/patches/additional-search-engines.patch

  • Committer: Chad Miller
  • Date: 2014-01-21 21:22:04 UTC
  • Revision ID: chad.miller@canonical.com-20140121212204-wkrfe0z1io4guv1g
* Upstream release 32.0.1700.77:  (LP: #1269387)
  - Tab indicators for sound, webcam and casting 
  - Automatically blocking malware files 
  - A number of new apps/extension APIs 
  - Lots of under the hood changes for stability and performance 
  - CVE-2013-6646: Use-after-free in web workers.
  - CVE-2013-6641: Use-after-free related to forms.
  - CVE-2013-6642: Address bar spoofing in Chrome for Android.
  - CVE-2013-6643: Unprompted sync with an attacker’s Google account.
  - CVE-2013-6645: Use-after-free related to speech input elements.
  - CVE-2013-6644: Various fixes from internal audits, fuzzing and other
    initiatives.
* Re-merged webapps patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/additional-search-engines.patch
46
46
   SEARCH_ENGINE_GOOGLE,
47
47
--- a/src/chrome/browser/search_engines/template_url_prepopulate_data.cc
48
48
+++ b/src/chrome/browser/search_engines/template_url_prepopulate_data.cc
49
 
@@ -55,7 +55,7 @@
 
49
@@ -54,7 +54,7 @@
50
50
 
51
51
 // Default (for countries with no better engine set)
52
52
 const PrepopulatedEngine* engines_default[] =
55
55
 
56
56
 // United Arab Emirates
57
57
 const PrepopulatedEngine* engines_AE[] =
58
 
@@ -147,7 +147,7 @@
 
58
@@ -146,7 +146,7 @@
59
59
 
60
60
 // Germany
61
61
 const PrepopulatedEngine* engines_DE[] =
64
64
 
65
65
 // Denmark
66
66
 const PrepopulatedEngine* engines_DK[] =
67
 
@@ -187,11 +187,11 @@
 
67
@@ -186,11 +186,11 @@
68
68
 
69
69
 // France
70
70
 const PrepopulatedEngine* engines_FR[] =
78
78
 
79
79
 // Greece
80
80
 const PrepopulatedEngine* engines_GR[] =
81
 
@@ -459,7 +459,7 @@
 
81
@@ -458,7 +458,7 @@
82
82
 
83
83
 // United States
84
84
 const PrepopulatedEngine* engines_US[] =
87
87
 
88
88
 // Uruguay
89
89
 const PrepopulatedEngine* engines_UY[] =
90
 
@@ -497,6 +497,7 @@
 
90
@@ -496,6 +496,7 @@
91
91
   &bing_fr_FR,   &bing_it_IT,   &bing_ja_JP,   &bing_lv_LV,   &bing_nb_NO,
92
92
   &bing_nl_BE,   &bing_pl_PL,   &bing_pt_BR,   &bing_pt_PT,   &bing_ru_RU,
93
93
   &bing_sv_SE,   &bing_tr_TR,   &bing_zh_HK,   &bing_zh_TW,   &daum,