Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 csagan5
|
dbf32840c6 | ||
|
csagan5
|
4b8e47060b | ||
|
csagan5
|
43bf98a956 |
+7
-1
@@ -1,7 +1,13 @@
|
||||
# 79.0.3945.111
|
||||
* restore enable-horizontal-tab-switcher flag
|
||||
* remove non-working contextual search settings
|
||||
* disable QUIC by default
|
||||
* fix DoH timeouts issue (https://github.com/bromite/bromite/issues/437)
|
||||
* remove logging for DoH timeouts
|
||||
|
||||
# 79.0.3945.107
|
||||
* always show cookies, javascript and ads site settings (fixes https://github.com/bromite/bromite/issues/133)
|
||||
* remove global ads and javascript menu options
|
||||
* fix crash with first tab open when using always incognito (fixes https://github.com/bromite/bromite/issues/453)
|
||||
|
||||
# 79.0.3945.100
|
||||
* log timeout values for DoH
|
||||
|
||||
@@ -69,14 +69,14 @@ Yes, since version 69. While the desktop version of Chromium has an option to di
|
||||
|
||||
# Features
|
||||
|
||||
* native adblock engine
|
||||
* customizable adblock filters via user-provided URL
|
||||
* remove click-tracking and AMP from search results
|
||||
* DNS-over-HTTPS support via Google, Cloudflare, Quad9 and AdGuard servers
|
||||
* [proxy configuration page](https://github.com/bromite/bromite/wiki/ProxyConfiguration) with PAC and custom proxy lists support
|
||||
* [StartPage](https://startpage.com/), [DuckDuckGo](https://duckduckgo.com/) and [Qwant](https://www.qwant.com/) search engines
|
||||
* chrome flags to disable custom intents and clear session on exit
|
||||
* DNS-over-HTTPS support, you can use any DoH endpoint
|
||||
* always-incognito mode
|
||||
* completely removed safe browsing and other privacy-unfriendly features
|
||||
* [proxy configuration page](https://github.com/bromite/bromite/wiki/ProxyConfiguration) with PAC and custom proxy lists support
|
||||
* [StartPage](https://startpage.com/), [DuckDuckGo](https://duckduckgo.com/) and [Qwant](https://www.qwant.com/) search engines available by default
|
||||
* chrome flags to disable custom intents and clear session on exit
|
||||
* anti-fingerprinting mitigations for canvas, audio, client rects, webGL and sensor APIs
|
||||
* use fixed User-Agent to conceal real model and browser version
|
||||
* privacy enhancement patches from [Iridium](https://iridiumbrowser.de/), [Inox patchset](https://github.com/gcarq/inox-patchset), [Brave](https://brave.com/) and [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) projects
|
||||
|
||||
@@ -138,5 +138,7 @@ Use-dummy-DFM-installer.patch
|
||||
Disable-password-reuse-detection-on-android.patch
|
||||
Allow-building-without-feed-support.patch
|
||||
Disable-addresses-autofill-by-default.patch
|
||||
Log-DoH-timeout.patch
|
||||
Always-show-site-settings-for-cookies-javascript-and-ads.patch
|
||||
Automated-domain-substitution.patch
|
||||
Do-not-enable-QUIC-by-default.patch
|
||||
Restore-enable-horizontal-tab-switcher-flag.patch
|
||||
|
||||
@@ -35,9 +35,9 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
|
||||
+ android:title="@string/allow_custom_tab_intents_title"
|
||||
+ android:summary="@string/allow_custom_tab_intents_summary"
|
||||
+ android:defaultValue="false" />
|
||||
<android.support.v7.preference.Preference
|
||||
android:key="contextual_search"
|
||||
android:title="@string/contextual_search_title"
|
||||
<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
|
||||
@@ -61,7 +61,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
|
||||
@@ -42,6 +42,8 @@ public class PrivacyPreferences
|
||||
@@ -41,6 +41,8 @@ public class PrivacyPreferences
|
||||
|
||||
private ManagedPreferenceDelegate mManagedPreferenceDelegate;
|
||||
|
||||
@@ -70,7 +70,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
@Override
|
||||
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
|
||||
PreferenceUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
|
||||
@@ -76,6 +78,10 @@ public class PrivacyPreferences
|
||||
@@ -75,6 +77,10 @@ public class PrivacyPreferences
|
||||
PrefServiceBridge.getInstance().setSearchSuggestEnabled((boolean) newValue);
|
||||
} else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
|
||||
PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
|
||||
@@ -78,10 +78,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
+ SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
|
||||
+ sharedPreferencesEditor.putBoolean(PREF_ALLOW_CUSTOM_TAB_INTENTS, (boolean)newValue);
|
||||
+ sharedPreferencesEditor.apply();
|
||||
} else if (PREF_CONTEXTUAL_SEARCH.equals(key)) {
|
||||
PrefServiceBridge.getInstance().setContextualSearchPreference(((boolean) newValue) ? "true" : "false");
|
||||
} else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
|
||||
@@ -114,6 +120,11 @@ public class PrivacyPreferences
|
||||
PrefServiceBridge.getInstance().setBoolean(
|
||||
Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
|
||||
@@ -111,6 +117,11 @@ public class PrivacyPreferences
|
||||
prefServiceBridge.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
|
||||
}
|
||||
|
||||
|
||||
@@ -3,12 +3,12 @@ Date: Sat, 7 Sep 2019 15:07:42 +0200
|
||||
Subject: Add option to not persist tabs across sessions
|
||||
|
||||
---
|
||||
chrome/android/java/res/values/values.xml | 3 +++
|
||||
chrome/android/java/res/xml/privacy_preferences.xml | 5 +++++
|
||||
.../chromium/chrome/browser/ChromeTabbedActivity.java | 4 +++-
|
||||
.../preferences/privacy/PrivacyPreferences.java | 11 +++++++++++
|
||||
.../android/java/strings/android_chrome_strings.grd | 6 ++++++
|
||||
5 files changed, 28 insertions(+), 1 deletion(-)
|
||||
chrome/android/java/res/values/values.xml | 3 +++
|
||||
chrome/android/java/res/xml/privacy_preferences.xml | 5 +++++
|
||||
.../chrome/browser/ChromeTabbedActivity.java | 4 +++-
|
||||
.../preferences/privacy/PrivacyPreferences.java | 12 ++++++++++++
|
||||
.../android/java/strings/android_chrome_strings.grd | 6 ++++++
|
||||
5 files changed, 29 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
|
||||
--- a/chrome/android/java/res/values/values.xml
|
||||
@@ -26,10 +26,10 @@ 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
|
||||
@@ -38,6 +38,11 @@
|
||||
android:key="contextual_search"
|
||||
android:title="@string/contextual_search_title"
|
||||
android:fragment="org.chromium.chrome.browser.preferences.privacy.ContextualSearchPreferenceFragment" />
|
||||
@@ -34,6 +34,11 @@
|
||||
android:title="@string/allow_custom_tab_intents_title"
|
||||
android:summary="@string/allow_custom_tab_intents_summary"
|
||||
android:defaultValue="false" />
|
||||
+ <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
|
||||
+ android:key="close_tabs_on_exit"
|
||||
+ android:title="@string/close_tabs_on_exit_title"
|
||||
@@ -72,15 +72,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
import org.chromium.base.BuildInfo;
|
||||
import org.chromium.chrome.R;
|
||||
import org.chromium.chrome.browser.ChromeFeatureList;
|
||||
@@ -37,6 +39,7 @@ public class PrivacyPreferences
|
||||
@@ -36,6 +38,7 @@ public class PrivacyPreferences
|
||||
private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";
|
||||
private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
|
||||
private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
|
||||
private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
|
||||
+ private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
|
||||
private static final String PREF_DO_NOT_TRACK = "do_not_track";
|
||||
private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
|
||||
|
||||
@@ -87,6 +90,10 @@ public class PrivacyPreferences
|
||||
@@ -84,6 +87,10 @@ public class PrivacyPreferences
|
||||
} else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
|
||||
PrefServiceBridge.getInstance().setBoolean(
|
||||
Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
|
||||
@@ -91,10 +91,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -137,6 +144,10 @@ public class PrivacyPreferences
|
||||
contextualPref.setSummary(isContextualSearchEnabled ? textOn : textOff);
|
||||
@@ -127,6 +134,11 @@ public class PrivacyPreferences
|
||||
doNotTrackPref.setSummary(
|
||||
prefServiceBridge.isDoNotTrackEnabled() ? R.string.text_on : R.string.text_off);
|
||||
}
|
||||
|
||||
+
|
||||
+ ChromeBaseCheckBoxPreference closeTabsOnExitPref =
|
||||
+ (ChromeBaseCheckBoxPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
|
||||
+ closeTabsOnExitPref.setOnPreferenceChangeListener(this);
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -40,7 +40,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
|
||||
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
|
||||
--- a/chrome/browser/profiles/profile.cc
|
||||
+++ b/chrome/browser/profiles/profile.cc
|
||||
@@ -231,7 +231,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
@@ -226,7 +226,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
prefs::kMediaRouterFirstRunFlowAcknowledged,
|
||||
false,
|
||||
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
||||
|
||||
@@ -8,7 +8,7 @@ Contains Android-specific fixes to remove Safe Browsing
|
||||
chrome/android/chrome_java_sources.gni | 1 -
|
||||
.../java/res/xml/privacy_preferences.xml | 21 -----
|
||||
.../res/xml/sync_and_services_preferences.xml | 20 -----
|
||||
.../privacy/PrivacyPreferences.java | 81 -------------------
|
||||
.../privacy/PrivacyPreferences.java | 77 -------------------
|
||||
.../browser/webshare/ShareServiceImpl.java | 6 --
|
||||
.../java/strings/android_chrome_strings.grd | 33 --------
|
||||
chrome/browser/BUILD.gn | 2 -
|
||||
@@ -16,11 +16,11 @@ Contains Android-specific fixes to remove Safe Browsing
|
||||
chrome/browser/browser_process_impl.cc | 36 ---------
|
||||
chrome/browser/browser_process_impl.h | 6 --
|
||||
.../chrome_browsing_data_remover_delegate.cc | 41 ----------
|
||||
.../browser/chrome_content_browser_client.cc | 60 +++-----------
|
||||
.../browser/chrome_content_browser_client.cc | 60 ++++-----------
|
||||
.../file_type_policies_component_installer.cc | 16 +---
|
||||
.../chrome_download_manager_delegate.cc | 31 +++----
|
||||
.../chrome_download_manager_delegate.cc | 31 +++-----
|
||||
.../chrome_download_manager_delegate.h | 8 +-
|
||||
.../browser/download/download_item_model.cc | 13 ++-
|
||||
.../browser/download/download_item_model.cc | 13 +++-
|
||||
chrome/browser/download/download_item_model.h | 4 +
|
||||
chrome/browser/download/download_prefs.cc | 17 ++--
|
||||
.../download/download_target_determiner.cc | 46 +++++------
|
||||
@@ -29,9 +29,9 @@ Contains Android-specific fixes to remove Safe Browsing
|
||||
.../browser/download/download_target_info.h | 4 +
|
||||
chrome/browser/download/download_ui_model.cc | 4 +
|
||||
chrome/browser/download/download_ui_model.h | 4 +
|
||||
.../extensions/api/downloads/downloads_api.cc | 39 +--------
|
||||
.../extensions/api/downloads/downloads_api.cc | 39 +---------
|
||||
.../extensions/api/downloads/downloads_api.h | 10 ---
|
||||
.../webstore_private/webstore_private_api.cc | 44 +---------
|
||||
.../webstore_private/webstore_private_api.cc | 44 +----------
|
||||
.../extensions/blacklist_state_fetcher.cc | 34 +-------
|
||||
.../extensions/blacklist_state_fetcher.h | 3 -
|
||||
.../metrics/chrome_metrics_service_client.cc | 3 -
|
||||
@@ -47,15 +47,15 @@ Contains Android-specific fixes to remove Safe Browsing
|
||||
.../chrome_subresource_filter_client.cc | 10 ---
|
||||
chrome/browser/ui/BUILD.gn | 1 -
|
||||
chrome/browser/ui/tab_helpers.cc | 8 --
|
||||
.../ui/webui/interstitials/interstitial_ui.cc | 13 +--
|
||||
.../ui/webui/interstitials/interstitial_ui.cc | 13 +---
|
||||
chrome/common/safe_browsing/BUILD.gn | 15 ----
|
||||
.../chrome_content_renderer_client.cc | 1 -
|
||||
components/safe_browsing/features.cc | 2 +-
|
||||
.../unified_consent_service.cc | 2 +-
|
||||
.../native_file_system_file_writer_impl.cc | 48 +----------
|
||||
.../native_file_system_file_writer_impl.cc | 48 +-----------
|
||||
.../native_file_system_file_writer_impl.h | 15 +---
|
||||
.../native_file_system_permission_context.h | 7 --
|
||||
50 files changed, 127 insertions(+), 637 deletions(-)
|
||||
50 files changed, 127 insertions(+), 633 deletions(-)
|
||||
|
||||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
@@ -148,15 +148,7 @@ diff --git a/chrome/android/java/res/xml/sync_and_services_preferences.xml b/chr
|
||||
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
|
||||
@@ -16,7 +16,6 @@ import android.view.MenuItem;
|
||||
import org.chromium.base.BuildInfo;
|
||||
import org.chromium.chrome.R;
|
||||
import org.chromium.chrome.browser.ChromeFeatureList;
|
||||
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial;
|
||||
import org.chromium.chrome.browser.help.HelpAndFeedback;
|
||||
import org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference;
|
||||
import org.chromium.chrome.browser.preferences.ManagedPreferenceDelegate;
|
||||
@@ -35,11 +34,7 @@ import org.chromium.ui.text.SpanApplier;
|
||||
@@ -34,11 +34,7 @@ import org.chromium.ui.text.SpanApplier;
|
||||
*/
|
||||
public class PrivacyPreferences
|
||||
extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener {
|
||||
@@ -166,9 +158,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
- "safe_browsing_scout_reporting";
|
||||
- private static final String PREF_SAFE_BROWSING = "safe_browsing";
|
||||
private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
|
||||
private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
|
||||
private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
|
||||
@@ -48,7 +43,6 @@ public class PrivacyPreferences
|
||||
private static final String PREF_DO_NOT_TRACK = "do_not_track";
|
||||
@@ -46,7 +42,6 @@ public class PrivacyPreferences
|
||||
private static final String PREF_SYNC_AND_SERVICES_LINK_DIVIDER =
|
||||
"sync_and_services_link_divider";
|
||||
private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
|
||||
@@ -176,7 +168,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
|
||||
private ManagedPreferenceDelegate mManagedPreferenceDelegate;
|
||||
|
||||
@@ -74,32 +68,11 @@ public class PrivacyPreferences
|
||||
@@ -72,28 +67,11 @@ public class PrivacyPreferences
|
||||
getPreferenceScreen().removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK_DIVIDER));
|
||||
getPreferenceScreen().removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK));
|
||||
|
||||
@@ -190,10 +182,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
searchSuggestionsPref.setOnPreferenceChangeListener(this);
|
||||
searchSuggestionsPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
|
||||
|
||||
- if (!ContextualSearchFieldTrial.isEnabled()) {
|
||||
- getPreferenceScreen().removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
|
||||
- }
|
||||
-
|
||||
- // Listen to changes to the Extended Reporting pref.
|
||||
- ChromeBaseCheckBoxPreference scoutReportingPref =
|
||||
- (ChromeBaseCheckBoxPreference) findPreference(
|
||||
@@ -209,7 +197,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
updateSummaries();
|
||||
}
|
||||
|
||||
@@ -108,15 +81,8 @@ public class PrivacyPreferences
|
||||
@@ -102,15 +80,8 @@ public class PrivacyPreferences
|
||||
String key = preference.getKey();
|
||||
if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
|
||||
PrefServiceBridge.getInstance().setSearchSuggestEnabled((boolean) newValue);
|
||||
@@ -222,10 +210,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
|
||||
- } else if (PREF_NAVIGATION_ERROR.equals(key)) {
|
||||
- PrefServiceBridge.getInstance().setResolveNavigationErrorEnabled((boolean) newValue);
|
||||
} else if (PREF_CONTEXTUAL_SEARCH.equals(key)) {
|
||||
PrefServiceBridge.getInstance().setContextualSearchPreference(((boolean) newValue) ? "true" : "false");
|
||||
} else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
|
||||
@@ -142,32 +108,12 @@ public class PrivacyPreferences
|
||||
PrefServiceBridge.getInstance().setBoolean(
|
||||
Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
|
||||
@@ -134,32 +105,12 @@ public class PrivacyPreferences
|
||||
CharSequence textOn = getActivity().getResources().getText(R.string.text_on);
|
||||
CharSequence textOff = getActivity().getResources().getText(R.string.text_off);
|
||||
|
||||
@@ -258,10 +246,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
CheckBoxPreference canMakePaymentPref =
|
||||
(CheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
|
||||
if (canMakePaymentPref != null) {
|
||||
@@ -187,42 +133,15 @@ public class PrivacyPreferences
|
||||
contextualPref.setSummary(isContextualSearchEnabled ? textOn : textOff);
|
||||
@@ -172,43 +123,15 @@ public class PrivacyPreferences
|
||||
doNotTrackPref.setSummary(
|
||||
prefServiceBridge.isDoNotTrackEnabled() ? R.string.text_on : R.string.text_off);
|
||||
}
|
||||
|
||||
-
|
||||
- Preference usageStatsPref = findPreference(PREF_USAGE_STATS);
|
||||
- if (usageStatsPref != null) {
|
||||
- if (BuildInfo.isAtLeastQ() && prefServiceBridge.getBoolean(Pref.USAGE_STATS_ENABLED)) {
|
||||
|
||||
@@ -26,7 +26,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
|
||||
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
|
||||
@@ -33,12 +33,5 @@
|
||||
@@ -29,12 +29,5 @@
|
||||
android:title="@string/clear_browsing_data_title"
|
||||
android:summary="@string/clear_browsing_data_summary"
|
||||
android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment" />
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
||||
Date: Sat, 4 Jan 2020 14:46:12 +0100
|
||||
Subject: Do not enable QUIC by default
|
||||
|
||||
For reference:
|
||||
* https://brave.com/quic-in-the-wild/
|
||||
* https://petsymposium.org/2019/files/papers/issue3/popets-2019-0046.pdf
|
||||
---
|
||||
.../browser/network_session_configurator.cc | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/components/network_session_configurator/browser/network_session_configurator.cc b/components/network_session_configurator/browser/network_session_configurator.cc
|
||||
--- a/components/network_session_configurator/browser/network_session_configurator.cc
|
||||
+++ b/components/network_session_configurator/browser/network_session_configurator.cc
|
||||
@@ -180,7 +180,7 @@ bool ShouldEnableQuic(base::StringPiece quic_trial_group,
|
||||
return quic_trial_group.starts_with(kQuicFieldTrialEnabledGroupName) ||
|
||||
quic_trial_group.starts_with(kQuicFieldTrialHttpsEnabledGroupName) ||
|
||||
base::LowerCaseEqualsASCII(
|
||||
- GetVariationParam(quic_trial_params, "enable_quic"), "true");
|
||||
+ GetVariationParam(quic_trial_params, "enable_quic"), "false");
|
||||
}
|
||||
|
||||
bool ShouldEnableQuicProxiesForHttpsUrls(
|
||||
@@ -188,7 +188,7 @@ bool ShouldEnableQuicProxiesForHttpsUrls(
|
||||
return base::LowerCaseEqualsASCII(
|
||||
GetVariationParam(quic_trial_params,
|
||||
"enable_quic_proxies_for_https_urls"),
|
||||
- "true");
|
||||
+ "false");
|
||||
}
|
||||
|
||||
bool ShouldRetryWithoutAltSvcOnQuicErrors(
|
||||
@@ -468,7 +468,6 @@ void ConfigureQuicParams(base::StringPiece quic_trial_group,
|
||||
params->enable_quic =
|
||||
ShouldEnableQuic(quic_trial_group, quic_trial_params,
|
||||
is_quic_force_disabled, is_quic_force_enabled);
|
||||
-
|
||||
params->enable_server_push_cancellation =
|
||||
ShouldEnableServerPushCancelation(quic_trial_params);
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
||||
Date: Sun, 15 Dec 2019 17:59:04 +0100
|
||||
Subject: Log DoH timeout
|
||||
|
||||
---
|
||||
net/dns/dns_session.cc | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/net/dns/dns_session.cc b/net/dns/dns_session.cc
|
||||
--- a/net/dns/dns_session.cc
|
||||
+++ b/net/dns/dns_session.cc
|
||||
@@ -325,9 +325,11 @@ base::TimeDelta DnsSession::NextTimeout(unsigned server_index, int attempt) {
|
||||
}
|
||||
|
||||
base::TimeDelta DnsSession::NextDohTimeout(unsigned doh_server_index) {
|
||||
- return NextTimeoutHelper(
|
||||
+ base::TimeDelta delta = NextTimeoutHelper(
|
||||
GetServerStats(doh_server_index, true /* is _doh_server */),
|
||||
0 /* num_backoffs */);
|
||||
+ LOG(INFO) << "DoH: using timeout: " << delta;
|
||||
+ return delta;
|
||||
}
|
||||
|
||||
base::TimeDelta DnsSession::NextTimeoutHelper(ServerStats* server_stats,
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -79,8 +79,8 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profil
|
||||
- true,
|
||||
+ false,
|
||||
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
||||
#if defined(OS_ANDROID)
|
||||
registry->RegisterStringPref(
|
||||
registry->RegisterBooleanPref(prefs::kSessionExitedCleanly, true);
|
||||
registry->RegisterStringPref(prefs::kSessionExitType, std::string());
|
||||
diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
|
||||
--- a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
|
||||
+++ b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
|
||||
|
||||
@@ -467,7 +467,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
import org.chromium.chrome.browser.profiles.Profile;
|
||||
import org.chromium.chrome.browser.usage_stats.UsageStatsConsentDialog;
|
||||
import org.chromium.ui.text.NoUnderlineClickableSpan;
|
||||
@@ -40,9 +39,6 @@ public class PrivacyPreferences
|
||||
@@ -39,9 +38,6 @@ public class PrivacyPreferences
|
||||
private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
|
||||
private static final String PREF_DO_NOT_TRACK = "do_not_track";
|
||||
private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
|
||||
@@ -477,7 +477,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
|
||||
private ManagedPreferenceDelegate mManagedPreferenceDelegate;
|
||||
|
||||
@@ -65,9 +61,6 @@ public class PrivacyPreferences
|
||||
@@ -64,9 +60,6 @@ public class PrivacyPreferences
|
||||
networkPredictionPref.setOnPreferenceChangeListener(this);
|
||||
networkPredictionPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
|
||||
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
||||
Date: Sat, 4 Jan 2020 14:49:43 +0100
|
||||
Subject: Restore enable-horizontal-tab-switcher flag
|
||||
|
||||
---
|
||||
chrome/browser/flag-metadata.json | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
|
||||
--- a/chrome/browser/flag-metadata.json
|
||||
+++ b/chrome/browser/flag-metadata.json
|
||||
@@ -1360,7 +1360,7 @@
|
||||
{
|
||||
"name": "enable-horizontal-tab-switcher",
|
||||
"owners": [ "memex-team@9oo91e.qjz9zk" ],
|
||||
- "expiry_milestone": 77
|
||||
+ "expiry_milestone": -1
|
||||
},
|
||||
{
|
||||
"name": "enable-hosted-app-quit-notification",
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -3,12 +3,48 @@ Date: Mon, 14 Oct 2019 20:27:33 +0200
|
||||
Subject: Revert "[Merge to M78] Enable AImageReader by default."
|
||||
|
||||
This reverts commit 60c3d4531b180b911767fb3ea7c3553d7f408c25.
|
||||
---
|
||||
gpu/config/gpu_finch_features.cc | 2 +-
|
||||
gpu/ipc/service/gpu_init.cc | 8 ++------
|
||||
media/base/media_switches.cc | 2 +-
|
||||
3 files changed, 4 insertions(+), 8 deletions(-)
|
||||
|
||||
Automatically disable hardware acceleration for Android Q on arm64
|
||||
---
|
||||
chrome/browser/android/chrome_startup_flags.cc | 9 +++++++++
|
||||
gpu/config/gpu_finch_features.cc | 2 +-
|
||||
gpu/ipc/service/gpu_init.cc | 8 ++------
|
||||
media/base/media_switches.cc | 2 +-
|
||||
4 files changed, 13 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/chrome/browser/android/chrome_startup_flags.cc b/chrome/browser/android/chrome_startup_flags.cc
|
||||
--- a/chrome/browser/android/chrome_startup_flags.cc
|
||||
+++ b/chrome/browser/android/chrome_startup_flags.cc
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
#include "chrome/browser/android/chrome_startup_flags.h"
|
||||
|
||||
+#include "base/android/build_info.h"
|
||||
#include "base/android/jni_android.h"
|
||||
#include "base/android/jni_string.h"
|
||||
#include "base/android/scoped_java_ref.h"
|
||||
@@ -16,6 +17,7 @@
|
||||
#include "chrome/common/chrome_switches.h"
|
||||
#include "components/browser_sync/browser_sync_switches.h"
|
||||
#include "components/dom_distiller/core/dom_distiller_switches.h"
|
||||
+#include "content/public/common/content_switches.h"
|
||||
#include "media/base/media_switches.h"
|
||||
|
||||
namespace {
|
||||
@@ -40,6 +42,13 @@ void SetChromeSpecificCommandLineFlags() {
|
||||
if (base::SysInfo::IsLowEndDevice())
|
||||
SetCommandLineSwitchASCII(switches::kDisableSyncTypes, "Favicon Images");
|
||||
|
||||
+#ifdef ARCH_CPU_ARM64
|
||||
+ // workaround for Android 10 "Q" arm64 crash
|
||||
+ if (base::android::BuildInfo::GetInstance()->sdk_int() > base::android::SDK_VERSION_P) {
|
||||
+ SetCommandLineSwitchASCII(switches::kDisableAcceleratedVideoDecode, "true");
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
// Enable DOM Distiller backend.
|
||||
SetCommandLineSwitch(switches::kEnableDomDistiller);
|
||||
}
|
||||
diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
|
||||
--- a/gpu/config/gpu_finch_features.cc
|
||||
+++ b/gpu/config/gpu_finch_features.cc
|
||||
|
||||
+73
-111
@@ -6,73 +6,71 @@ Subject: Revert "Remove pre unified consent code in sync and privacy
|
||||
This reverts commit c672a0683e89eba3554e2562156b3c8532136f21.
|
||||
|
||||
Restore translations
|
||||
Restore contextual search preference toggle
|
||||
Disable unified consent on Android
|
||||
Unified consent miscellanous backport fixes
|
||||
---
|
||||
.../java/res/xml/privacy_preferences.xml | 30 +++++
|
||||
.../privacy/PrivacyPreferences.java | 117 +++++++++++++++---
|
||||
.../java/res/xml/privacy_preferences.xml | 26 +++++
|
||||
.../privacy/PrivacyPreferences.java | 103 +++++++++++++++---
|
||||
.../preferences/sync/SyncPreferenceUtils.java | 2 +-
|
||||
.../sync/SyncNotificationController.java | 11 +-
|
||||
.../java/strings/android_chrome_strings.grd | 15 +++
|
||||
.../android_chrome_strings_am.xtb | 19 ++-
|
||||
.../android_chrome_strings_ar.xtb | 19 ++-
|
||||
.../android_chrome_strings_bg.xtb | 19 ++-
|
||||
.../android_chrome_strings_bn.xtb | 19 ++-
|
||||
.../android_chrome_strings_ca.xtb | 19 ++-
|
||||
.../android_chrome_strings_cs.xtb | 19 ++-
|
||||
.../android_chrome_strings_da.xtb | 19 ++-
|
||||
.../android_chrome_strings_de.xtb | 19 ++-
|
||||
.../android_chrome_strings_el.xtb | 19 ++-
|
||||
.../android_chrome_strings_en-GB.xtb | 19 ++-
|
||||
.../android_chrome_strings_es-419.xtb | 19 ++-
|
||||
.../android_chrome_strings_es.xtb | 19 ++-
|
||||
.../android_chrome_strings_et.xtb | 19 ++-
|
||||
.../android_chrome_strings_fa.xtb | 19 ++-
|
||||
.../android_chrome_strings_fi.xtb | 19 ++-
|
||||
.../android_chrome_strings_fil.xtb | 19 ++-
|
||||
.../android_chrome_strings_fr.xtb | 19 ++-
|
||||
.../android_chrome_strings_gu.xtb | 19 ++-
|
||||
.../android_chrome_strings_hi.xtb | 19 ++-
|
||||
.../android_chrome_strings_hr.xtb | 19 ++-
|
||||
.../android_chrome_strings_hu.xtb | 19 ++-
|
||||
.../android_chrome_strings_id.xtb | 19 ++-
|
||||
.../android_chrome_strings_it.xtb | 19 ++-
|
||||
.../android_chrome_strings_iw.xtb | 19 ++-
|
||||
.../android_chrome_strings_ja.xtb | 19 ++-
|
||||
.../android_chrome_strings_kn.xtb | 19 ++-
|
||||
.../android_chrome_strings_ko.xtb | 19 ++-
|
||||
.../android_chrome_strings_lt.xtb | 19 ++-
|
||||
.../android_chrome_strings_lv.xtb | 19 ++-
|
||||
.../android_chrome_strings_ml.xtb | 19 ++-
|
||||
.../android_chrome_strings_mr.xtb | 19 ++-
|
||||
.../android_chrome_strings_ms.xtb | 19 ++-
|
||||
.../android_chrome_strings_nl.xtb | 19 ++-
|
||||
.../android_chrome_strings_no.xtb | 19 ++-
|
||||
.../android_chrome_strings_pl.xtb | 19 ++-
|
||||
.../android_chrome_strings_pt-BR.xtb | 19 ++-
|
||||
.../android_chrome_strings_pt-PT.xtb | 19 ++-
|
||||
.../android_chrome_strings_ro.xtb | 19 ++-
|
||||
.../android_chrome_strings_ru.xtb | 19 ++-
|
||||
.../android_chrome_strings_sk.xtb | 19 ++-
|
||||
.../android_chrome_strings_sl.xtb | 19 ++-
|
||||
.../android_chrome_strings_sr.xtb | 19 ++-
|
||||
.../android_chrome_strings_sv.xtb | 19 ++-
|
||||
.../android_chrome_strings_sw.xtb | 19 ++-
|
||||
.../android_chrome_strings_ta.xtb | 19 ++-
|
||||
.../android_chrome_strings_te.xtb | 19 ++-
|
||||
.../android_chrome_strings_th.xtb | 19 ++-
|
||||
.../android_chrome_strings_tr.xtb | 19 ++-
|
||||
.../android_chrome_strings_uk.xtb | 19 ++-
|
||||
.../android_chrome_strings_vi.xtb | 19 ++-
|
||||
.../android_chrome_strings_zh-CN.xtb | 19 ++-
|
||||
.../android_chrome_strings_zh-TW.xtb | 19 ++-
|
||||
.../android_chrome_strings_am.xtb | 19 +++-
|
||||
.../android_chrome_strings_ar.xtb | 19 +++-
|
||||
.../android_chrome_strings_bg.xtb | 19 +++-
|
||||
.../android_chrome_strings_bn.xtb | 19 +++-
|
||||
.../android_chrome_strings_ca.xtb | 19 +++-
|
||||
.../android_chrome_strings_cs.xtb | 19 +++-
|
||||
.../android_chrome_strings_da.xtb | 19 +++-
|
||||
.../android_chrome_strings_de.xtb | 19 +++-
|
||||
.../android_chrome_strings_el.xtb | 19 +++-
|
||||
.../android_chrome_strings_en-GB.xtb | 19 +++-
|
||||
.../android_chrome_strings_es-419.xtb | 19 +++-
|
||||
.../android_chrome_strings_es.xtb | 19 +++-
|
||||
.../android_chrome_strings_et.xtb | 19 +++-
|
||||
.../android_chrome_strings_fa.xtb | 19 +++-
|
||||
.../android_chrome_strings_fi.xtb | 19 +++-
|
||||
.../android_chrome_strings_fil.xtb | 19 +++-
|
||||
.../android_chrome_strings_fr.xtb | 19 +++-
|
||||
.../android_chrome_strings_gu.xtb | 19 +++-
|
||||
.../android_chrome_strings_hi.xtb | 19 +++-
|
||||
.../android_chrome_strings_hr.xtb | 19 +++-
|
||||
.../android_chrome_strings_hu.xtb | 19 +++-
|
||||
.../android_chrome_strings_id.xtb | 19 +++-
|
||||
.../android_chrome_strings_it.xtb | 19 +++-
|
||||
.../android_chrome_strings_iw.xtb | 19 +++-
|
||||
.../android_chrome_strings_ja.xtb | 19 +++-
|
||||
.../android_chrome_strings_kn.xtb | 19 +++-
|
||||
.../android_chrome_strings_ko.xtb | 19 +++-
|
||||
.../android_chrome_strings_lt.xtb | 19 +++-
|
||||
.../android_chrome_strings_lv.xtb | 19 +++-
|
||||
.../android_chrome_strings_ml.xtb | 19 +++-
|
||||
.../android_chrome_strings_mr.xtb | 19 +++-
|
||||
.../android_chrome_strings_ms.xtb | 19 +++-
|
||||
.../android_chrome_strings_nl.xtb | 19 +++-
|
||||
.../android_chrome_strings_no.xtb | 19 +++-
|
||||
.../android_chrome_strings_pl.xtb | 19 +++-
|
||||
.../android_chrome_strings_pt-BR.xtb | 19 +++-
|
||||
.../android_chrome_strings_pt-PT.xtb | 19 +++-
|
||||
.../android_chrome_strings_ro.xtb | 19 +++-
|
||||
.../android_chrome_strings_ru.xtb | 19 +++-
|
||||
.../android_chrome_strings_sk.xtb | 19 +++-
|
||||
.../android_chrome_strings_sl.xtb | 19 +++-
|
||||
.../android_chrome_strings_sr.xtb | 19 +++-
|
||||
.../android_chrome_strings_sv.xtb | 19 +++-
|
||||
.../android_chrome_strings_sw.xtb | 19 +++-
|
||||
.../android_chrome_strings_ta.xtb | 19 +++-
|
||||
.../android_chrome_strings_te.xtb | 19 +++-
|
||||
.../android_chrome_strings_th.xtb | 19 +++-
|
||||
.../android_chrome_strings_tr.xtb | 19 +++-
|
||||
.../android_chrome_strings_uk.xtb | 19 +++-
|
||||
.../android_chrome_strings_vi.xtb | 19 +++-
|
||||
.../android_chrome_strings_zh-CN.xtb | 19 +++-
|
||||
.../android_chrome_strings_zh-TW.xtb | 19 +++-
|
||||
.../chrome/browser/sync/SyncTestRule.java | 9 +-
|
||||
.../chromium/chrome/browser/sync/UkmTest.java | 50 +++++++-
|
||||
chrome/browser/profiles/profile.cc | 3 +-
|
||||
.../chromium/chrome/browser/sync/UkmTest.java | 50 ++++++++-
|
||||
chrome/browser/profiles/profile.cc | 6 -
|
||||
.../unified_consent_service_factory.cc | 5 +-
|
||||
components/unified_consent/feature.cc | 2 +-
|
||||
62 files changed, 1150 insertions(+), 82 deletions(-)
|
||||
61 files changed, 1130 insertions(+), 85 deletions(-)
|
||||
|
||||
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
|
||||
@@ -102,7 +100,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
|
||||
<org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
|
||||
android:key="can_make_payment"
|
||||
android:title="@string/can_make_payment_title"
|
||||
@@ -19,15 +37,27 @@
|
||||
@@ -19,6 +37,10 @@
|
||||
android:key="usage_stats_reporting"
|
||||
android:title="@string/usage_stats_setting_title"
|
||||
android:persistent="false" />
|
||||
@@ -113,13 +111,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
|
||||
<Preference
|
||||
android:fragment="org.chromium.chrome.browser.preferences.privacy.DoNotTrackPreference"
|
||||
android:key="do_not_track"
|
||||
android:title="@string/do_not_track_title" />
|
||||
+ <android.support.v7.preference.Preference
|
||||
+ android:key="contextual_search"
|
||||
+ android:title="@string/contextual_search_title"
|
||||
+ android:fragment="org.chromium.chrome.browser.preferences.privacy.ContextualSearchPreferenceFragment" />
|
||||
<Preference
|
||||
android:key="clear_browsing_data"
|
||||
@@ -28,6 +50,10 @@
|
||||
android:title="@string/clear_browsing_data_title"
|
||||
android:summary="@string/clear_browsing_data_summary"
|
||||
android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment" />
|
||||
@@ -133,16 +125,15 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
|
||||
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
|
||||
@@ -15,6 +15,8 @@ import android.view.MenuItem;
|
||||
@@ -15,6 +15,7 @@ import android.view.MenuItem;
|
||||
|
||||
import org.chromium.base.BuildInfo;
|
||||
import org.chromium.chrome.R;
|
||||
+import org.chromium.chrome.browser.ChromeFeatureList;
|
||||
+import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial;
|
||||
import org.chromium.chrome.browser.help.HelpAndFeedback;
|
||||
import org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference;
|
||||
import org.chromium.chrome.browser.preferences.ManagedPreferenceDelegate;
|
||||
@@ -33,18 +35,25 @@ import org.chromium.ui.text.SpanApplier;
|
||||
@@ -33,18 +34,24 @@ import org.chromium.ui.text.SpanApplier;
|
||||
*/
|
||||
public class PrivacyPreferences
|
||||
extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener {
|
||||
@@ -152,7 +143,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
+ "safe_browsing_scout_reporting";
|
||||
+ private static final String PREF_SAFE_BROWSING = "safe_browsing";
|
||||
private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
|
||||
+ private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
|
||||
private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
|
||||
- private static final String PREF_USAGE_STATS = "usage_stats_reporting";
|
||||
private static final String PREF_DO_NOT_TRACK = "do_not_track";
|
||||
@@ -171,7 +161,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
PreferenceUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
|
||||
getActivity().setTitle(R.string.prefs_privacy);
|
||||
setHasOptionsMenu(true);
|
||||
@@ -62,26 +71,57 @@ public class PrivacyPreferences
|
||||
@@ -62,26 +69,51 @@ public class PrivacyPreferences
|
||||
networkPredictionPref.setOnPreferenceChangeListener(this);
|
||||
networkPredictionPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
|
||||
|
||||
@@ -196,10 +186,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
+ searchSuggestionsPref.setOnPreferenceChangeListener(this);
|
||||
+ searchSuggestionsPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
|
||||
+
|
||||
+ if (!ContextualSearchFieldTrial.isEnabled()) {
|
||||
+ getPreferenceScreen().removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
|
||||
+ }
|
||||
+
|
||||
+ // Listen to changes to the Extended Reporting pref.
|
||||
+ ChromeBaseCheckBoxPreference scoutReportingPref =
|
||||
+ (ChromeBaseCheckBoxPreference) findPreference(
|
||||
@@ -233,15 +219,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
|
||||
+ } else if (PREF_NAVIGATION_ERROR.equals(key)) {
|
||||
+ PrefServiceBridge.getInstance().setResolveNavigationErrorEnabled((boolean) newValue);
|
||||
+ } else if (PREF_CONTEXTUAL_SEARCH.equals(key)) {
|
||||
+ PrefServiceBridge.getInstance().setContextualSearchPreference(((boolean) newValue) ? "true" : "false");
|
||||
+ } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
|
||||
+ PrefServiceBridge.getInstance().setBoolean(
|
||||
+ Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -99,6 +139,35 @@ public class PrivacyPreferences
|
||||
@@ -99,6 +131,35 @@ public class PrivacyPreferences
|
||||
public void updateSummaries() {
|
||||
PrefServiceBridge prefServiceBridge = PrefServiceBridge.getInstance();
|
||||
|
||||
@@ -277,20 +261,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
CheckBoxPreference canMakePaymentPref =
|
||||
(CheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
|
||||
if (canMakePaymentPref != null) {
|
||||
@@ -112,6 +181,12 @@ public class PrivacyPreferences
|
||||
prefServiceBridge.isDoNotTrackEnabled() ? R.string.text_on : R.string.text_off);
|
||||
}
|
||||
|
||||
+ Preference contextualPref = findPreference(PREF_CONTEXTUAL_SEARCH);
|
||||
+ if (contextualPref != null) {
|
||||
+ boolean isContextualSearchEnabled = !prefServiceBridge.isContextualSearchDisabled();
|
||||
+ contextualPref.setSummary(isContextualSearchEnabled ? textOn : textOff);
|
||||
+ }
|
||||
+
|
||||
Preference usageStatsPref = findPreference(PREF_USAGE_STATS);
|
||||
if (usageStatsPref != null) {
|
||||
if (BuildInfo.isAtLeastQ() && prefServiceBridge.getBoolean(Pref.USAGE_STATS_ENABLED)) {
|
||||
@@ -136,6 +211,18 @@ public class PrivacyPreferences
|
||||
@@ -136,6 +197,18 @@ public class PrivacyPreferences
|
||||
return preference -> {
|
||||
String key = preference.getKey();
|
||||
PrefServiceBridge prefs = PrefServiceBridge.getInstance();
|
||||
@@ -1903,16 +1874,19 @@ diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/UkmTe
|
||||
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
|
||||
--- a/chrome/browser/profiles/profile.cc
|
||||
+++ b/chrome/browser/profiles/profile.cc
|
||||
@@ -154,8 +154,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
#if defined(OS_ANDROID)
|
||||
registry->RegisterStringPref(
|
||||
prefs::kContextualSearchEnabled,
|
||||
@@ -151,12 +151,6 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
prefs::kSearchSuggestEnabled,
|
||||
true,
|
||||
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
||||
-#if defined(OS_ANDROID)
|
||||
- registry->RegisterStringPref(
|
||||
- prefs::kContextualSearchEnabled,
|
||||
- std::string(),
|
||||
- user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
||||
+ std::string());
|
||||
#endif // defined(OS_ANDROID)
|
||||
-#endif // defined(OS_ANDROID)
|
||||
registry->RegisterBooleanPref(prefs::kSessionExitedCleanly, true);
|
||||
registry->RegisterStringPref(prefs::kSessionExitType, std::string());
|
||||
registry->RegisterInt64Pref(prefs::kSiteEngagementLastUpdateTime, 0,
|
||||
diff --git a/chrome/browser/unified_consent/unified_consent_service_factory.cc b/chrome/browser/unified_consent/unified_consent_service_factory.cc
|
||||
--- a/chrome/browser/unified_consent/unified_consent_service_factory.cc
|
||||
+++ b/chrome/browser/unified_consent/unified_consent_service_factory.cc
|
||||
@@ -1928,18 +1902,6 @@ diff --git a/chrome/browser/unified_consent/unified_consent_service_factory.cc b
|
||||
};
|
||||
}
|
||||
|
||||
diff --git a/components/unified_consent/feature.cc b/components/unified_consent/feature.cc
|
||||
--- a/components/unified_consent/feature.cc
|
||||
+++ b/components/unified_consent/feature.cc
|
||||
@@ -11,7 +11,7 @@ namespace unified_consent {
|
||||
// base::Feature definition.
|
||||
const base::Feature kUnifiedConsent {
|
||||
"UnifiedConsent",
|
||||
-#if defined(OS_CHROMEOS)
|
||||
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
|
||||
base::FEATURE_DISABLED_BY_DEFAULT
|
||||
#else
|
||||
base::FEATURE_ENABLED_BY_DEFAULT
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user