Remaining fixes for the privacy preferences crash, NTP and other defaults/improvements
This commit is contained in:
csagan5
parent
df3dfe5f7e
commit
e8d9c95516
11 changed files with 301 additions and 65 deletions
|
|
@ -1,8 +1,11 @@
|
|||
# 79.0.3945.94
|
||||
* removed Startpage
|
||||
* removed patches which do not apply anymore (Widevine version punting, always show homepage settings, network errors UMA recording)
|
||||
* removed split APKs support
|
||||
* disabled password reuse functionality
|
||||
* removed split APKs support (Play integration)
|
||||
* disabled password reuse functionality (Play integration)
|
||||
* re-introduced minimal headers for DoH
|
||||
* removed Startpage
|
||||
* disable feed support
|
||||
* updated User-agent version
|
||||
|
||||
# 78.0.3904.130
|
||||
* support user-specified subresources filter URL (fixes https://github.com/bromite/bromite/issues/2)
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
Disable-third-party-cookies-by-default.patch
|
||||
Revert-Remove-pre-unified-consent-code-in-sync-and-privacy-directory.patch
|
||||
Revert-Remove-UnifiedConsent-from-ChromeFeatureList.patch
|
||||
Disable-unified-consent-on-Android.patch
|
||||
Restore-classic-new-tab-page.patch
|
||||
Always-use-new-tab-page-for-default-home-page.patch
|
||||
Always-allow-partner-customisation.patch
|
||||
Always-show-home-page-settings.patch
|
||||
battery_status_service-disable-more-privacy-nightmares.patch
|
||||
Battery-API-return-nothing.patch
|
||||
google-cloud-messaging-disable-experiment-status-check.patch
|
||||
|
|
@ -45,7 +44,6 @@ Remove-background-sync-and-translate-menu-options.patch
|
|||
Hide-passwords-manager-link.patch
|
||||
Disable-Omaha-update-checks.patch
|
||||
Disable-update-scheduler.patch
|
||||
Add-StartPage-search-engine.patch
|
||||
Add-English-only-search-engine.patch
|
||||
Add-DuckDuckGo-Lite-search-engine.patch
|
||||
Add-Qwant-search-engine.patch
|
||||
|
|
@ -67,7 +65,6 @@ User-Agent-anonymize.patch
|
|||
AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch
|
||||
Multiple-fingerprinting-mitigations-for-canvas-text-and-client-rectangles.patch
|
||||
Add-flags-to-disable-device-motion-and-orientation-APIs.patch
|
||||
Punt-the-Widevine-version-string.patch
|
||||
Disable-metrics-on-all-I-O-threads.patch
|
||||
Always-respect-async-dns-flag-regardless-of-SDK-version.patch
|
||||
Add-flag-to-configure-maximum-connections-per-host.patch
|
||||
|
|
@ -102,7 +99,6 @@ Remove-dependency-on-com.google.android.gms.flags-com.google.android.gms.locatio
|
|||
Remove-dependency-on-com.google.android.gms.fido-com.google.android.gms.iid-com.google.android.gms.instantapps-com.google.android.gms.location.patch
|
||||
Remove-dependency-on-com.google.android.gms.cast.patch
|
||||
Remove-dependency-on-com.google.android.gms.common-auth-signin-dynamic-com.google.android.gms.tasks.patch
|
||||
Remove-play-dependency-for-module-installer.patch
|
||||
Remove-SMS-integration.patch
|
||||
Allow-website-sign-in-without-account-sign-in.patch
|
||||
Offer-builtin-autocomplete-for-chrome-flags.patch
|
||||
|
|
@ -127,12 +123,11 @@ disable-payment-support-by-default.patch
|
|||
disable-background-sync-by-default.patch
|
||||
disable-sensors-access-site-setting-by-default.patch
|
||||
Disable-media-router-and-remoting-by-default.patch
|
||||
Do-not-record-UMA-for-network-errors.patch
|
||||
Disable-unified-consent-on-Android.patch
|
||||
Revert-Cleanup-Search-Ready-Omnibox-flag-since-it-has-launched.patch
|
||||
Disable-search-ready-omnibox-by-default.patch
|
||||
disable-AdsBlockedInfoBar.patch
|
||||
Bromite-AdBlockUpdaterService.patch
|
||||
Add-option-to-configure-the-ad-blocker-filters-URL.patch
|
||||
Revert-Merge-to-M78-Enable-AImageReader-by-default.patch
|
||||
Replace-DoH-probe-domain-with-RIPE-domain.patch
|
||||
Increase-number-of-autocomplete-matches-from-5-to-10.patch
|
||||
|
|
@ -141,5 +136,10 @@ Block-all-connection-requests-with-qjz9zk-in-the-domain-name-or-with-a-trk-schem
|
|||
Disable-some-signed-exchange-features.patch
|
||||
Add-flag-to-disable-WebGL.patch
|
||||
Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch
|
||||
Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch
|
||||
Revert-flags-remove-disable-pull-to-refresh-effect.patch
|
||||
Add-option-to-configure-the-ad-blocker-filters-URL.patch
|
||||
Use-dummy-DFM-installer.patch
|
||||
Disable-password-reuse-detection-on-android.patch
|
||||
Unified-consent-miscellanous-backport-fixes.patch
|
||||
Allow-building-without-feed-support.patch
|
||||
Disable-addresses-autofill-by-default.patch
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Revert-Remove-pre-unified-consent-code-in-sync-and-privacy-directory.patch
|
||||
Revert-Remove-UnifiedConsent-from-ChromeFeatureList.patch
|
||||
Disable-unified-consent-on-Android.patch
|
||||
Unified-consent-miscellanous-backport-fixes.patch
|
||||
AV1-codec-support.patch
|
||||
Switch-to-fstack-protector-strong.patch
|
||||
Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
|
||||
Disable-safe-browsing.patch
|
||||
Disable-sync-services-menu-entry.patch
|
||||
Disable-password-reuse-detection-on-android.patch
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
||||
Date: Mon, 16 Dec 2019 23:16:04 +0100
|
||||
Subject: Allow building with safe_browsing_mode=0
|
||||
|
||||
---
|
||||
chrome/browser/browser_resources.grd | 4 +---
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
|
||||
--- a/chrome/browser/browser_resources.grd
|
||||
+++ b/chrome/browser/browser_resources.grd
|
||||
@@ -152,9 +152,7 @@
|
||||
<include name="IDR_DOMAIN_RELIABILITY_INTERNALS_HTML" file="resources\domain_reliability_internals\domain_reliability_internals.html" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_DOMAIN_RELIABILITY_INTERNALS_CSS" file="resources\domain_reliability_internals\domain_reliability_internals.css" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_DOMAIN_RELIABILITY_INTERNALS_JS" file="resources\domain_reliability_internals\domain_reliability_internals.js" compress="gzip" type="BINDATA" />
|
||||
- <if expr="safe_browsing_mode != 0">
|
||||
- <include name="IDR_DOWNLOAD_FILE_TYPES_PB" file="${root_gen_dir}\chrome\browser\resources\safe_browsing\download_file_types.pb" use_base_dir="false" type="BINDATA" />
|
||||
- </if>
|
||||
+ <include name="IDR_DOWNLOAD_FILE_TYPES_PB" file="${root_gen_dir}\chrome\browser\resources\safe_browsing\download_file_types.pb" use_base_dir="false" type="BINDATA" />
|
||||
<include name="IDR_DOWNLOAD_INTERNALS_HTML" file="resources\download_internals\download_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" />
|
||||
<include name="IDR_DOWNLOAD_INTERNALS_CSS" file="resources\download_internals\download_internals.css" type="BINDATA" compress="gzip" />
|
||||
<include name="IDR_DOWNLOAD_INTERNALS_JS" file="resources\download_internals\download_internals.js" type="BINDATA" compress="gzip" />
|
||||
--
|
||||
2.17.1
|
||||
|
||||
33
build/patches/Allow-building-without-feed-support.patch
Normal file
33
build/patches/Allow-building-without-feed-support.patch
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
||||
Date: Thu, 19 Dec 2019 22:52:53 +0100
|
||||
Subject: Allow building without feed support
|
||||
|
||||
---
|
||||
.../chrome/browser/ntp/cards/ExploreOfflineCard.java | 5 +----
|
||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/ExploreOfflineCard.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/ExploreOfflineCard.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/ExploreOfflineCard.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/ExploreOfflineCard.java
|
||||
@@ -13,7 +13,6 @@ import org.chromium.base.ApiCompatibilityUtils;
|
||||
import org.chromium.chrome.R;
|
||||
import org.chromium.chrome.browser.ChromeFeatureList;
|
||||
import org.chromium.chrome.browser.download.DownloadUtils;
|
||||
-import org.chromium.chrome.browser.feed.FeedConfiguration;
|
||||
import org.chromium.net.NetworkChangeNotifier;
|
||||
import org.chromium.ui.text.SpanApplier;
|
||||
|
||||
@@ -73,9 +72,7 @@ public class ExploreOfflineCard {
|
||||
|
||||
View imageView = cardView.findViewById(R.id.explore_offline_image);
|
||||
imageView.setBackground(imageView.getContext().getResources().getDrawable(
|
||||
- FeedConfiguration.getFeedUiEnabled()
|
||||
- ? R.drawable.card_background_rounded_right_half_with_border
|
||||
- : R.drawable.card_background_rounded_right_half_no_border));
|
||||
+ R.drawable.card_background_rounded_right_half_no_border));
|
||||
|
||||
cardView.setOnClickListener(v -> mOpenDownloadHomeCallback.run());
|
||||
return cardView;
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
@ -3,8 +3,9 @@ Date: Thu, 12 Oct 2017 08:15:17 +0200
|
|||
Subject: Disable NTP remote suggestions by default
|
||||
|
||||
---
|
||||
components/ntp_snippets/features.cc | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
components/ntp_snippets/features.cc | 4 ++--
|
||||
.../remote/remote_suggestions_status_service_impl.cc | 4 ++--
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/features.cc
|
||||
--- a/components/ntp_snippets/features.cc
|
||||
|
|
@ -27,6 +28,20 @@ diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/featu
|
|||
|
||||
const base::Feature kOptionalImagesEnabledFeature{
|
||||
"NTPRemoteSuggestionsOptionalImages", base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
diff --git a/components/ntp_snippets/remote/remote_suggestions_status_service_impl.cc b/components/ntp_snippets/remote/remote_suggestions_status_service_impl.cc
|
||||
--- a/components/ntp_snippets/remote/remote_suggestions_status_service_impl.cc
|
||||
+++ b/components/ntp_snippets/remote/remote_suggestions_status_service_impl.cc
|
||||
@@ -36,8 +36,8 @@ RemoteSuggestionsStatusServiceImpl::~RemoteSuggestionsStatusServiceImpl() =
|
||||
// static
|
||||
void RemoteSuggestionsStatusServiceImpl::RegisterProfilePrefs(
|
||||
PrefRegistrySimple* registry) {
|
||||
- registry->RegisterBooleanPref(prefs::kEnableSnippets, true);
|
||||
- registry->RegisterBooleanPref(prefs::kArticlesListVisible, true);
|
||||
+ registry->RegisterBooleanPref(prefs::kEnableSnippets, false);
|
||||
+ registry->RegisterBooleanPref(prefs::kArticlesListVisible, false);
|
||||
}
|
||||
|
||||
void RemoteSuggestionsStatusServiceImpl::Init(
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
|
|||
36
build/patches/Disable-addresses-autofill-by-default.patch
Normal file
36
build/patches/Disable-addresses-autofill-by-default.patch
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
||||
Date: Thu, 19 Dec 2019 21:46:10 +0100
|
||||
Subject: Disable addresses autofill by default
|
||||
|
||||
---
|
||||
.../autofill_assistant/AutofillAssistantPreferencesUtil.java | 2 +-
|
||||
.../autofill_assistant/AutofillAssistantPreferences.java | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java
|
||||
--- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java
|
||||
+++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java
|
||||
@@ -25,7 +25,7 @@ class AutofillAssistantPreferencesUtil {
|
||||
/** Checks whether the Autofill Assistant switch preference in settings is on. */
|
||||
static boolean isAutofillAssistantSwitchOn() {
|
||||
return ContextUtils.getAppSharedPreferences().getBoolean(
|
||||
- AutofillAssistantPreferences.PREF_AUTOFILL_ASSISTANT_SWITCH, true);
|
||||
+ AutofillAssistantPreferences.PREF_AUTOFILL_ASSISTANT_SWITCH, false);
|
||||
}
|
||||
|
||||
/** Checks whether the Autofill Assistant onboarding has been accepted. */
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill_assistant/AutofillAssistantPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill_assistant/AutofillAssistantPreferences.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill_assistant/AutofillAssistantPreferences.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill_assistant/AutofillAssistantPreferences.java
|
||||
@@ -48,7 +48,7 @@ public class AutofillAssistantPreferences extends PreferenceFragmentCompat {
|
||||
// (e.g. the switch will say "On" when it is really turned off), so .setChecked() should be
|
||||
// called after .addPreference()
|
||||
autofillAssistantSwitch.setChecked(ContextUtils.getAppSharedPreferences().getBoolean(
|
||||
- PREF_AUTOFILL_ASSISTANT_SWITCH, true));
|
||||
+ PREF_AUTOFILL_ASSISTANT_SWITCH, false));
|
||||
}
|
||||
|
||||
private Context getStyledContext() {
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
@ -0,0 +1,102 @@
|
|||
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
||||
Date: Sat, 28 Apr 2018 08:30:26 +0200
|
||||
Subject: Reduce HTTP headers in DoH requests to bare minimum
|
||||
|
||||
Serve DoH requests with maximum priority.
|
||||
---
|
||||
net/base/load_flags_list.h | 6 ++++++
|
||||
net/dns/dns_transaction.cc | 3 ++-
|
||||
net/url_request/url_request_http_job.cc | 16 +++++++++++-----
|
||||
3 files changed, 19 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h
|
||||
--- a/net/base/load_flags_list.h
|
||||
+++ b/net/base/load_flags_list.h
|
||||
@@ -106,6 +106,12 @@ LOAD_FLAG(SUPPORT_ASYNC_REVALIDATION, 1 << 16)
|
||||
// the LOAD_CAN_USE_RESTRICTED_PREFETCH load flag.
|
||||
LOAD_FLAG(RESTRICTED_PREFETCH, 1 << 17)
|
||||
|
||||
+// This load will not send Accept-Language or User-Agent headers, and not
|
||||
+// advertise brotli encoding.
|
||||
+// Used to comply with IETF (draft) DNS-over-HTTPS:
|
||||
+// "Implementors SHOULD NOT set non-essential HTTP headers in DoH client requests."
|
||||
+LOAD_FLAG(MINIMAL_HEADERS, 1 << 18)
|
||||
+
|
||||
// This flag must be set on requests that are allowed to reuse cache entries
|
||||
// that are marked as RESTRICTED_PREFETCH. Requests without this flag cannot
|
||||
// reuse restricted prefetch responses in the cache. Restricted response reuse
|
||||
diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
|
||||
--- a/net/dns/dns_transaction.cc
|
||||
+++ b/net/dns/dns_transaction.cc
|
||||
@@ -403,6 +403,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
|
||||
// perspective to prevent the client from sending AIA requests).
|
||||
request_->SetLoadFlags(request_->load_flags() | LOAD_DISABLE_CACHE |
|
||||
LOAD_BYPASS_PROXY |
|
||||
+ LOAD_IGNORE_LIMITS | LOAD_MINIMAL_HEADERS |
|
||||
LOAD_DISABLE_CERT_NETWORK_FETCHES);
|
||||
request_->set_allow_credentials(false);
|
||||
}
|
||||
@@ -1004,7 +1005,7 @@ class DnsTransactionImpl : public DnsTransaction,
|
||||
had_tcp_attempt_(false),
|
||||
first_server_index_(0),
|
||||
url_request_context_(url_request_context),
|
||||
- request_priority_(DEFAULT_PRIORITY) {
|
||||
+ request_priority_(MAXIMUM_PRIORITY) {
|
||||
DCHECK(session_.get());
|
||||
DCHECK(!hostname_.empty());
|
||||
DCHECK(!callback_.is_null());
|
||||
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
|
||||
--- a/net/url_request/url_request_http_job.cc
|
||||
+++ b/net/url_request/url_request_http_job.cc
|
||||
@@ -354,6 +354,7 @@ void URLRequestHttpJob::Start() {
|
||||
// plugin could set a referrer although sending the referrer is inhibited.
|
||||
request_info_.extra_headers.RemoveHeader(HttpRequestHeaders::kReferer);
|
||||
|
||||
+ if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS)) {
|
||||
// Our consumer should have made sure that this is a safe referrer. See for
|
||||
// instance WebCore::FrameLoader::HideReferrer.
|
||||
if (referrer.is_valid()) {
|
||||
@@ -369,11 +370,14 @@ void URLRequestHttpJob::Start() {
|
||||
request_info_.extra_headers.SetHeader(HttpRequestHeaders::kReferer,
|
||||
referer_value);
|
||||
}
|
||||
+ }
|
||||
|
||||
+ if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS)) {
|
||||
request_info_.extra_headers.SetHeaderIfMissing(
|
||||
HttpRequestHeaders::kUserAgent,
|
||||
http_user_agent_settings_ ?
|
||||
http_user_agent_settings_->GetUserAgent() : std::string());
|
||||
+ }
|
||||
|
||||
AddExtraHeaders();
|
||||
AddCookieHeaderAndStart();
|
||||
@@ -588,10 +592,12 @@ void URLRequestHttpJob::AddExtraHeaders() {
|
||||
} else {
|
||||
// Advertise "br" encoding only if transferred data is opaque to proxy.
|
||||
bool advertise_brotli = false;
|
||||
- if (request()->context()->enable_brotli()) {
|
||||
- if (request()->url().SchemeIsCryptographic() ||
|
||||
- IsLocalhost(request()->url())) {
|
||||
- advertise_brotli = true;
|
||||
+ if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS)) {
|
||||
+ if (request()->context()->enable_brotli()) {
|
||||
+ if (request()->url().SchemeIsCryptographic() ||
|
||||
+ IsLocalhost(request()->url())) {
|
||||
+ advertise_brotli = true;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -609,7 +615,7 @@ void URLRequestHttpJob::AddExtraHeaders() {
|
||||
}
|
||||
}
|
||||
|
||||
- if (http_user_agent_settings_) {
|
||||
+ if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS) && http_user_agent_settings_) {
|
||||
// Only add default Accept-Language if the request didn't have it
|
||||
// specified.
|
||||
std::string accept_language =
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
||||
Date: Thu, 26 Sep 2019 00:00:43 +0200
|
||||
Subject: Revert "Remove UnifiedConsent from ChromeFeatureList"
|
||||
|
||||
This reverts commit c513d4c926a42ba6cc5eccfd5e85ba64c38bf0c1.
|
||||
---
|
||||
.../java/src/org/chromium/chrome/browser/ChromeFeatureList.java | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
|
||||
@@ -347,6 +347,7 @@ public abstract class ChromeFeatureList {
|
||||
public static final String TRUSTED_WEB_ACTIVITY_NOTIFICATION_DELEGATION_ENROLMENT =
|
||||
"TrustedWebActivityNotificationDelegationAutoEnrolment";
|
||||
public static final String VIDEO_PERSISTENCE = "VideoPersistence";
|
||||
+ public static final String UNIFIED_CONSENT = "UnifiedConsent";
|
||||
public static final String USAGE_STATS = "UsageStats";
|
||||
public static final String VR_BROWSING_FEEDBACK = "VrBrowsingFeedback";
|
||||
public static final String WEBAPK_ADAPTIVE_ICON = "WebApkAdaptiveIcon";
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
@ -0,0 +1,95 @@
|
|||
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
||||
Date: Wed, 18 Dec 2019 23:54:37 +0100
|
||||
Subject: Unified consent miscellanous backport fixes
|
||||
|
||||
---
|
||||
.../privacy/PrivacyPreferences.java | 26 -------------------
|
||||
.../sync/SyncNotificationController.java | 12 +++------
|
||||
2 files changed, 3 insertions(+), 35 deletions(-)
|
||||
|
||||
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
|
||||
@@ -10,7 +10,6 @@ import android.support.graphics.drawable.VectorDrawableCompat;
|
||||
import android.support.v7.preference.CheckBoxPreference;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceFragmentCompat;
|
||||
-import android.support.v7.preference.PreferenceScreen;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuInflater;
|
||||
import android.view.MenuItem;
|
||||
@@ -50,13 +49,10 @@ public class PrivacyPreferences
|
||||
|
||||
@Override
|
||||
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
|
||||
- PrivacyPreferencesManager privacyPrefManager = PrivacyPreferencesManager.getInstance();
|
||||
- privacyPrefManager.migrateNetworkPredictionPreferences();
|
||||
PreferenceUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
|
||||
getActivity().setTitle(R.string.prefs_privacy);
|
||||
setHasOptionsMenu(true);
|
||||
PrefServiceBridge prefServiceBridge = PrefServiceBridge.getInstance();
|
||||
- PreferenceScreen preferenceScreen = getPreferenceScreen();
|
||||
|
||||
mManagedPreferenceDelegate = createManagedPreferenceDelegate();
|
||||
|
||||
@@ -70,27 +66,6 @@ public class PrivacyPreferences
|
||||
networkPredictionPref.setOnPreferenceChangeListener(this);
|
||||
networkPredictionPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
|
||||
|
||||
- if (ChromeFeatureList.isEnabled(ChromeFeatureList.UNIFIED_CONSENT)) {
|
||||
- // Remove preferences that were migrated to SyncAndServicesPreferences.
|
||||
- preferenceScreen.removePreference(findPreference(PREF_SEARCH_SUGGESTIONS));
|
||||
- preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
|
||||
-
|
||||
- // TODO(https://crbug.com/846376): Update strings in XML after UNIFIED_CONSENT launch.
|
||||
- networkPredictionPref.setTitle(R.string.preload_pages_title);
|
||||
- networkPredictionPref.setSummary(R.string.preload_pages_summary);
|
||||
-
|
||||
- // Put networkPredictionPref after canMakePaymentPref by overriding order value.
|
||||
- // However, calling setOrder doesn't change existing order if Preference has already
|
||||
- // been added to PreferenceGroup. Remove and re-add it to work around this.
|
||||
- // TODO(https://crbug.com/846376): Reorder prefs in XML after UNIFIED_CONSENT launch.
|
||||
- preferenceScreen.removePreference(networkPredictionPref);
|
||||
- networkPredictionPref.setOrder(canMakePaymentPref.getOrder());
|
||||
- preferenceScreen.addPreference(networkPredictionPref);
|
||||
-
|
||||
- updateSummaries();
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
ChromeBaseCheckBoxPreference searchSuggestionsPref =
|
||||
(ChromeBaseCheckBoxPreference) findPreference(PREF_SEARCH_SUGGESTIONS);
|
||||
searchSuggestionsPref.setOnPreferenceChangeListener(this);
|
||||
@@ -135,7 +110,6 @@ public class PrivacyPreferences
|
||||
*/
|
||||
public void updateSummaries() {
|
||||
PrefServiceBridge prefServiceBridge = PrefServiceBridge.getInstance();
|
||||
- PrivacyPreferencesManager privacyPrefManager = PrivacyPreferencesManager.getInstance();
|
||||
|
||||
CharSequence textOn = getActivity().getResources().getText(R.string.text_on);
|
||||
CharSequence textOff = getActivity().getResources().getText(R.string.text_off);
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java
|
||||
@@ -157,15 +157,9 @@ public class SyncNotificationController implements ProfileSyncService.SyncStateC
|
||||
* @return the intent for opening the settings
|
||||
*/
|
||||
private Intent createSettingsIntent() {
|
||||
- final String fragmentName;
|
||||
- final Bundle fragmentArguments;
|
||||
- if (ChromeFeatureList.isEnabled(ChromeFeatureList.UNIFIED_CONSENT)) {
|
||||
- fragmentName = SyncAndServicesPreferences.class.getName();
|
||||
- fragmentArguments = SyncAndServicesPreferences.createArguments(false);
|
||||
- } else {
|
||||
- fragmentName = AccountManagementFragment.class.getName();
|
||||
- fragmentArguments = null;
|
||||
- }
|
||||
+ final String fragmentName = AccountManagementFragment.class.getName();
|
||||
+ final Bundle fragmentArguments = null;
|
||||
+
|
||||
return PreferencesLauncher.createIntentForSettingsPage(
|
||||
ContextUtils.getApplicationContext(), fragmentName, fragmentArguments);
|
||||
}
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ diff --git a/components/version_info/version_info.cc b/components/version_info/v
|
|||
std::string GetProductNameAndVersionForUserAgent() {
|
||||
- return "Chrome/" + GetVersionNumber();
|
||||
+ // latest stable version
|
||||
+ return "Chrome/78.0.3904.108";
|
||||
+ return "Chrome/79.0.3945.79";
|
||||
}
|
||||
|
||||
std::string GetProductName() {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue