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

Unverified Commit 8d494540 authored by csagan5's avatar csagan5
Browse files

Release 77.0.3865.104

parent 74cb09ea
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
# 77.0.3865.104
* revert upstream commit for search privacy options and related translations removal (fixes https://github.com/bromite/bromite/issues/375)
* remove unused patch for enabling subresource filter on all sites

# 77.0.3865.95

# 77.0.3865.81
+288 −473

File changed.

Preview size limit exceeded, changes collapsed.

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
+        android:title="@string/proxy_title"
+        app:url="@string/proxy_url" />
     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreferenceCompat
         android:key="can_make_payment"
         android:title="@string/can_make_payment_title"
         android:key="search_suggestions"
         android:title="@string/search_suggestions_title"
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -692,6 +692,14 @@ CHAR-LIMIT guidelines:
@@ -674,6 +674,14 @@ CHAR-LIMIT guidelines:
         Search and site suggestions disabled
       </message>
 
+16 −16
Original line number Diff line number Diff line
@@ -26,18 +26,18 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -15,6 +15,11 @@
         android:title="@string/preload_pages_title"
         android:summary="@string/preload_pages_summary"
         android:persistent="false" />
@@ -23,6 +23,11 @@
         android:key="contextual_search"
         android:title="@string/contextual_search_title"
         android:fragment="org.chromium.chrome.browser.preferences.privacy.ContextualSearchPreferenceFragment" />
+    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreferenceCompat
+        android:key="allow_custom_tab_intents"
+        android:title="@string/allow_custom_tab_intents_title"
+        android:summary="@string/allow_custom_tab_intents_summary"
+        android:defaultValue="false" />
     <org.chromium.chrome.browser.preferences.ChromeBasePreferenceCompat
         android:key="usage_stats_reporting"
         android:title="@string/usage_stats_setting_title"
     <android.support.v7.preference.Preference
         android:key="clear_browsing_data"
         android:title="@string/clear_browsing_data_title"
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
@@ -60,7 +60,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
@@ -39,6 +39,8 @@ public class PrivacyPreferences
@@ -43,6 +43,8 @@ public class PrivacyPreferences
 
     private ManagedPreferenceDelegateCompat mManagedPreferenceDelegate;
 
@@ -69,18 +69,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         PrivacyPreferencesManager privacyPrefManager = PrivacyPreferencesManager.getInstance();
@@ -69,6 +71,10 @@ public class PrivacyPreferences
         if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
             PrefServiceBridge.getInstance().setBoolean(
                     Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
@@ -84,6 +86,10 @@ public class PrivacyPreferences
         String key = preference.getKey();
         if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
             PrefServiceBridge.getInstance().setSearchSuggestEnabled((boolean) newValue);
+        } else if (PREF_ALLOW_CUSTOM_TAB_INTENTS.equals(key)) {
+            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
+            sharedPreferencesEditor.putBoolean(PREF_ALLOW_CUSTOM_TAB_INTENTS, (boolean)newValue);
+            sharedPreferencesEditor.apply();
         } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
             PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
         }
@@ -98,6 +104,11 @@ public class PrivacyPreferences
 
         return true;
@@ -119,6 +125,11 @@ public class PrivacyPreferences
                     prefServiceBridge.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
         }
 
@@ -95,7 +95,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -3965,6 +3965,13 @@ The site does NOT gain access to the camera. The camera images are only visible
@@ -3944,6 +3944,13 @@ The site does NOT gain access to the camera. The camera images are only visible
       <message name="IDS_INCOGNITO_DISCLOSURE_CHECKBOX_TEXT" desc="Text for checkbox inviting to close incognito tabs in incognito disclosure dialog." translateable="false">
          Close other incognito tabs
       </message>
Loading