Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98c2ec93 authored by Romain Hunault's avatar Romain Hunault
Browse files

Move to v72.0.3626.87

parent 96947533
Loading
Loading
Loading
Loading
Loading
+8 −9
Original line number Diff line number Diff line
From 97bb3e6bb7de9a45b664a05ef8f41f00d8100907 Mon Sep 17 00:00:00 2001
From: root <root@e-builder.ralfhein.de>
Date: Thu, 31 Jan 2019 14:58:48 +0100
From: Romain HUNAULT <romain.hunault@e.email>
Subject: [PATCH] Set search engines
Date: Tue, 5 Feb 2019 16:05:17 +0100

---
 .../chrome/browser/locale/LocaleManager.java  |    1 -
@@ -14,10 +13,10 @@ Subject: [PATCH] Set search engines
 7 files changed, 123 insertions(+), 1261 deletions(-)

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/locale/LocaleManager.java b/chrome/android/java/src/org/chromium/chrome/browser/locale/LocaleManager.java
index 1fa11a63f3d2..5e764b4d0b74 100644
index ae847f1c6476..8b46ca6a4547 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/locale/LocaleManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/locale/LocaleManager.java
@@ -198,7 +198,6 @@ public class LocaleManager {
@@ -195,7 +195,6 @@ public class LocaleManager {
      */
     public void revertDefaultSearchEngineOverride() {
         if (!isSearchEngineAutoSwitchEnabled() || isSpecialLocaleEnabled()) return;
@@ -1265,10 +1264,10 @@ index 4ec103acdbde..f727471195c8 100644
 
 #endif  // COMPONENTS_SEARCH_ENGINES_SEARCH_ENGINE_TYPE_H_
diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
index dcdb5ce6f891..883e1c0ef506 100644
index fd83335b1dea..f09afa1790af 100644
--- a/components/search_engines/template_url_prepopulate_data.cc
+++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -51,562 +51,547 @@ namespace {
@@ -33,562 +33,547 @@ namespace {
 
 // Default (for countries with no better engine set)
 const PrepopulatedEngine* const engines_default[] = {
@@ -1939,8 +1938,8 @@ index dcdb5ce6f891..883e1c0ef506 100644
+    &espot, &qwant, &duckduckgo, &duckduckgo_light,
 };
 
 // Please refer to ISO 3166-1 for information about the two-character country
@@ -1201,16 +1186,6 @@ std::unique_ptr<TemplateURLData> GetPrepopulatedDefaultSearch(
 std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulationSetFromCountryID(
@@ -1040,16 +1025,6 @@ std::unique_ptr<TemplateURLData> GetPrepopulatedDefaultSearch(
 SearchEngineType GetEngineType(const GURL& url) {
   DCHECK(url.is_valid());