Updated patches for latest release

From: Romain HUNAULT <romain.hunault@e.email>

Date: Wed, 6 Feb 2019 19:38:00 +0100

Date: Tue, 16 Apr 2019 22:27:43 +0200

Subject: [PATCH] Add /e/ browser informations in About

---

         android:key="application_version"

         android:title="@string/application_version_title" />

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/AboutChromePreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/AboutChromePreferences.java

index 4fa819207e98..9be9571ed589 100644

index f19d3c9f6fdd..53e3cef068d4 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/AboutChromePreferences.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/AboutChromePreferences.java

@@ -26,6 +26,7 @@ public class AboutChromePreferences extends PreferenceFragment {

@@ -30,6 +30,7 @@ public class AboutChromePreferences

     private static final String PREF_APPLICATION_VERSION = "application_version";

     private static final String PREF_OS_VERSION = "os_version";

     private static final String PREF_LEGAL_INFORMATION = "legal_information";

+    private static final String PREF_E_BROWSER_INFORMATIONS = "e_browser_informations";

     @Override

     public void onCreate(Bundle savedInstanceState) {

@@ -39,9 +40,8 @@ public class AboutChromePreferences extends PreferenceFragment {

         p.setSummary(getApplicationVersion(getActivity(), versionStrings.getApplicationVersion()));

     // Non-translated strings:

     private static final String MSG_DEVELOPER_ENABLE_COUNTDOWN =

@@ -58,9 +59,8 @@ public class AboutChromePreferences

         p.setOnPreferenceClickListener(this);

         p = findPreference(PREF_OS_VERSION);

         p.setSummary(versionStrings.getOSVersion());

-        p = findPreference(PREF_LEGAL_INFORMATION);

     /**

diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd

index 1cb432938492..9ec3d879b6e9 100644

index 8d423fbfdf72..0352ecb7d809 100644

--- a/chrome/android/java/strings/android_chrome_strings.grd

+++ b/chrome/android/java/strings/android_chrome_strings.grd

@@ -1494,9 +1494,6 @@ Your Google account may have other forms of browsing history like searches and a

@@ -1455,9 +1455,6 @@ Your Google account may have other forms of browsing history like searches and a

       <message name="IDS_PREFS_ABOUT_CHROME" desc="Title for the About Chrome page. [CHAR-LIMIT=32]">

         About Chrome

       </message>

       <message name="IDS_APPLICATION_VERSION_TITLE" desc="Title for application version">

         Application version

       </message>

@@ -1509,6 +1506,12 @@ Your Google account may have other forms of browsing history like searches and a

@@ -1470,6 +1467,12 @@ Your Google account may have other forms of browsing history like searches and a

       <message name="IDS_DEPRECATION_WARNING" desc="Warning about Chrome updates no longer being supported">

         Chrome updates are no longer supported for this version of Android

       </message>