-@@ -4319,7 +4319,7 @@ To change this setting, <resetlink>reset sync<resetlink>reset sync
@@ -9619,7 +9619,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
No compatible devices found
-@@ -4356,7 +4356,7 @@ To change this setting, <resetlink>reset sync<resetlink>reset sync
%1$sChromium
@@ -9628,7 +9628,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
%1$sYouTube also has data in Chrome
-@@ -4709,7 +4709,7 @@ To change this setting, <resetlink>reset sync<resetlink>reset sync
%1$sTanya's Pixel 2...
@@ -9637,7 +9637,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
List of devices to share a tab with.
-@@ -4748,7 +4748,7 @@ To change this setting, <resetlink>reset sync<resetlink>reset sync
%1$sphone
@@ -9646,7 +9646,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
You can send tabs between devices that are signed in with the same Google Account
-@@ -5763,7 +5763,7 @@ To change this setting, <resetlink>reset sync<resetlink>reset sync
@@ -9655,7 +9655,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
Your browser is not managed
-@@ -5778,7 +5778,7 @@ To change this setting, <resetlink>reset sync<resetlink>reset sync
@@ -13475,6 +13475,15 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components
"state": {
"usable": {
@@ -44,7 +44,7 @@
+ "description": "Google 'Argon2024' log",
+ "log_id": "7s3QZNXbGs7FXLedtM0TojKHRny87N7DUUhZRnEftZs=",
+ "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEHblsqctplMVc5ramA7vSuNxUQxcomQwGAVAdnWTAWUYr3MgDHQW0LagJ95lB7QT75Ve6JgT2EVLOFGU7L3YrwA==",
+- "url": "https://ct.googleapis.com/logs/us1/argon2024/",
++ "url": "https://ct.9oo91eapis.qjz9zk/logs/us1/argon2024/",
+ "mmd": 86400,
+ "state": {
+ "qualified": {
+@@ -60,7 +60,7 @@
"description": "Google 'Xenon2022' log",
"log_id": "RqVV63X6kSAwtaKJafTzfREsQXS+/Um4havy/HD+bUc=",
"key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE+WS9FSxAYlCVEzg8xyGwOrmPonoV14nWjjETAIdZvLvukPzIWBMKv6tDNlQjpIHNrUcUt1igRPpqoKDXw2MeKw==",
@@ -13483,7 +13492,7 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components
"mmd": 86400,
"state": {
"usable": {
-@@ -60,7 +60,7 @@
+@@ -76,7 +76,7 @@
"description": "Google 'Xenon2023' log",
"log_id": "rfe++nz/EMiLnT2cHj4YarRnKV3PsQwkyoWGNOvcgoo=",
"key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEchY+C+/vzj5g3ZXLY3q5qY1Kb2zcYYCmRV4vg6yU84WI0KV00HuO/8XuQqLwLZPjwtCymeLhQunSxgAnaXSuzg==",
@@ -13492,7 +13501,16 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components
"mmd": 86400,
"state": {
"usable": {
-@@ -76,7 +76,7 @@
+@@ -92,7 +92,7 @@
+ "description": "Google 'Xenon2024' log",
+ "log_id": "dv+IPwq2+5VRwmHM9Ye6NLSkzbsp3GhCCp/mZ0xaOnQ=",
+ "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuWDgNB415GUAk0+QCb1a7ETdjA/O7RE+KllGmjG2x5n33O89zY+GwjWlPtwpurvyVOKoDIMIUQbeIW02UI44TQ==",
+- "url": "https://ct.googleapis.com/logs/eu1/xenon2024/",
++ "url": "https://ct.9oo91eapis.qjz9zk/logs/eu1/xenon2024/",
+ "mmd": 86400,
+ "state": {
+ "qualified": {
+@@ -108,7 +108,7 @@
"description": "Google 'Icarus' log",
"log_id": "KTxRllTIOWW6qlD8WAfUt2+/WHopctykwwz05UVH9Hg=",
"key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAETtK8v7MICve56qTHHDhhBOuV4IlUaESxZryCfk9QbG9co/CqPvTsgPDbCpp6oFtyAHwlDhnvr7JijXRD9Cb2FA==",
@@ -13500,8 +13518,8 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components
+ "url": "https://ct.9oo91eapis.qjz9zk/icarus/",
"mmd": 86400,
"state": {
- "readonly": {
-@@ -92,7 +92,7 @@
+ "retired": {
+@@ -120,7 +120,7 @@
"description": "Google 'Pilot' log",
"log_id": "pLkJkLQYWBSHuxOizGdwCjw1mAT5G9+443fNDsgN3BA=",
"key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEfahLEimAoz2t01p3uMziiLOl/fHTDM0YDOhBRuiBARsV4UvxG2LdNgoIGLrtCzWE0J5APC2em4JlvR8EEEFMoA==",
@@ -13509,8 +13527,8 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components
+ "url": "https://ct.9oo91eapis.qjz9zk/pilot/",
"mmd": 86400,
"state": {
- "readonly": {
-@@ -108,7 +108,7 @@
+ "retired": {
+@@ -132,7 +132,7 @@
"description": "Google 'Rocketeer' log",
"log_id": "7ku9t3XOYLrhQmkfq+GeZqMPfl+wctiDAMR7iXqo/cs=",
"key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIFsYyDzBi7MxCAC/oJBXK7dHjG+1aLCOkHjpoHPqTyghLpzA9BYbqvnV16mAw04vUjyYASVGJCUoI3ctBcJAeg==",
@@ -13518,8 +13536,8 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components
+ "url": "https://ct.9oo91eapis.qjz9zk/rocketeer/",
"mmd": 86400,
"state": {
- "readonly": {
-@@ -124,7 +124,7 @@
+ "retired": {
+@@ -144,7 +144,7 @@
"description": "Google 'Skydiver' log",
"log_id": "u9nfvB+KcbWTlCOXqpJ7RzhXlQqrUugakJZkNo4e0YU=",
"key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEEmyGDvYXsRJsNyXSrYc9DjHsIa2xzb4UR7ZxVoV6mrc9iZB7xjI6+NrOiwH+P/xxkRmOFG6Jel20q37hTh58rA==",
@@ -13527,7 +13545,7 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components
+ "url": "https://ct.9oo91eapis.qjz9zk/skydiver/",
"mmd": 86400,
"state": {
- "readonly": {
+ "retired": {
diff --git a/components/commerce/core/heuristics/resources/cart_domain_cart_url_regex.json b/components/commerce/core/heuristics/resources/cart_domain_cart_url_regex.json
--- a/components/commerce/core/heuristics/resources/cart_domain_cart_url_regex.json
+++ b/components/commerce/core/heuristics/resources/cart_domain_cart_url_regex.json
@@ -29289,7 +29307,7 @@ diff --git a/content/browser/portal/portal_navigation_throttle.cc b/content/brow
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
-@@ -5379,7 +5379,7 @@ NavigationRequest::CheckCredentialedSubresource() const {
+@@ -5386,7 +5386,7 @@ NavigationRequest::CheckCredentialedSubresource() const {
const char* console_message =
"Subresource requests whose URLs contain embedded credentials (e.g. "
"`https://user:pass@host/`) are blocked. See "
@@ -29298,7 +29316,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows
"details.";
parent->AddMessageToConsole(blink::mojom::ConsoleMessageLevel::kWarning,
console_message);
-@@ -5610,7 +5610,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck(
+@@ -5617,7 +5617,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck(
base::StringPrintf(
"Navigating a cross-origin opener to a download (%s) is "
"deprecated, see "
@@ -35199,7 +35217,7 @@ diff --git a/testing/variations/PRESUBMIT.py b/testing/variations/PRESUBMIT.py
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
--- a/testing/variations/fieldtrial_testing_config.json
+++ b/testing/variations/fieldtrial_testing_config.json
-@@ -784,7 +784,7 @@
+@@ -799,7 +799,7 @@
{
"name": "Enabled_20210611",
"params": {
@@ -35208,7 +35226,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati
},
"enable_features": [
"AutofillAssistantInCctTriggering",
-@@ -1521,7 +1521,7 @@
+@@ -1536,7 +1536,7 @@
{
"name": "Enabled_All_20220418",
"params": {
@@ -35217,7 +35235,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati
},
"enable_features": [
"AutomaticLazyFrameLoadingToAds",
-@@ -1532,7 +1532,7 @@
+@@ -1547,7 +1547,7 @@
{
"name": "Enabled_LazyEmbeds_20220418",
"params": {
@@ -35226,7 +35244,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati
},
"enable_features": [
"AutomaticLazyFrameLoadingToEmbedUrls",
-@@ -1555,7 +1555,7 @@
+@@ -1570,7 +1570,7 @@
{
"name": "Control_20220418",
"params": {
@@ -35235,7 +35253,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati
},
"enable_features": [
"AutomaticLazyFrameLoadingToEmbedUrls"
-@@ -7208,14 +7208,14 @@
+@@ -7253,14 +7253,14 @@
{
"name": "Prefetch_2_20220214",
"params": {
@@ -35252,7 +35270,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati
"use_speculation_rules": "true"
},
"enable_features": [
-@@ -7407,7 +7407,7 @@
+@@ -7452,7 +7452,7 @@
{
"name": "EnabledExploreAndServerRankingAndRawTrendingSegmentation2",
"params": {
@@ -35261,7 +35279,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati
"experiment_tag": "{maxLevels : 1, rankTiles : true, enableTrending : true, maxTrendingQueries : 8, disableEntityTranslation: true}",
"image_prefetch_mode": "top",
"is_unmetered_network_required": "false",
-@@ -7432,7 +7432,7 @@
+@@ -7477,7 +7477,7 @@
{
"name": "EnabledExploreAndTrendingSegmentation2",
"params": {
@@ -35270,7 +35288,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati
"behavioural_targeting": "model_comparison",
"experiment_tag": "{maxLevels : 1, enableTrending : true, maxTrendingQueries : 8}",
"image_prefetch_mode": "top",
-@@ -9575,7 +9575,7 @@
+@@ -9635,7 +9635,7 @@
{
"name": "Enabled",
"params": {
diff --git a/build/patches/Disable-add-to-home-screen-prompt.patch b/build/patches/Disable-add-to-home-screen-prompt.patch
new file mode 100644
index 00000000..94c2c85f
--- /dev/null
+++ b/build/patches/Disable-add-to-home-screen-prompt.patch
@@ -0,0 +1,26 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 28 Sep 2022 00:54:10 +0200
+Subject: Disable add to home screen prompt
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ .../webapps/AddToHomescreenMostVisitedTileClickObserver.java | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenMostVisitedTileClickObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenMostVisitedTileClickObserver.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenMostVisitedTileClickObserver.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenMostVisitedTileClickObserver.java
+@@ -43,10 +43,7 @@ public class AddToHomescreenMostVisitedTileClickObserver implements MostVisitedT
+ ntp.addMostVisitedTileClickObserver(
+ AddToHomescreenMostVisitedTileClickObserver.this);
+ } else {
+- // If it is a regular web page, and started from a most visited tile, show IPH.
+- if (url.getOrigin().equals(mLastClickedMostVisitedTileUrl)) {
+- addToHomescreenIPHController.showAddToHomescreenIPH(tab);
+- }
++ // do not show any add to home screen IPH in Bromite
+ removeObserver(tab);
+ }
+ mLastClickedMostVisitedTileUrl = null;
+--
+2.25.1
diff --git a/build/patches/Disable-smart-selection-by-default.patch b/build/patches/Disable-smart-selection-by-default.patch
index e2459147..27894295 100644
--- a/build/patches/Disable-smart-selection-by-default.patch
+++ b/build/patches/Disable-smart-selection-by-default.patch
@@ -97,7 +97,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
--- a/testing/variations/fieldtrial_testing_config.json
+++ b/testing/variations/fieldtrial_testing_config.json
-@@ -2400,6 +2400,21 @@
+@@ -2415,6 +2415,21 @@
]
}
],
diff --git a/build/patches/Enable-HEVC-by-default.patch b/build/patches/Enable-HEVC-by-default.patch
new file mode 100644
index 00000000..79911b7d
--- /dev/null
+++ b/build/patches/Enable-HEVC-by-default.patch
@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 27 Sep 2022 23:39:54 +0200
+Subject: Enable HEVC by default
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ media/base/media_switches.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
+--- a/media/base/media_switches.cc
++++ b/media/base/media_switches.cc
+@@ -275,7 +275,7 @@ const base::Feature kPictureInPicture{"PictureInPicture",
+ #if BUILDFLAG(ENABLE_PLATFORM_HEVC)
+ // Enables HEVC hardware accelerated decoding.
+ const base::Feature kPlatformHEVCDecoderSupport{
+- "PlatformHEVCDecoderSupport", base::FEATURE_DISABLED_BY_DEFAULT};
++ "PlatformHEVCDecoderSupport", base::FEATURE_ENABLED_BY_DEFAULT};
+ #endif // BUILDFLAG(ENABLE_PLATFORM_HEVC)
+
+ // Only decode preload=metadata elements upon visibility.
+--
+2.25.1
diff --git a/build/patches/Move-navigation-bar-to-bottom.patch b/build/patches/Move-navigation-bar-to-bottom.patch
index 75329eff..5c550774 100644
--- a/build/patches/Move-navigation-bar-to-bottom.patch
+++ b/build/patches/Move-navigation-bar-to-bottom.patch
@@ -1321,7 +1321,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
PrivacyPreferencesManagerImpl.getInstance(), mLocationBarModel,
mActionModeController.getActionModeCallback(),
new WindowDelegate(mActivity.getWindow()), windowAndroid, mActivityTabProvider,
-@@ -860,11 +863,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -865,11 +868,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
// the height won't be measured by the background image.
if (mControlContainer.getBackground() == null) {
setControlContainerTopMargin(getToolbarExtraYOffset());
@@ -1335,7 +1335,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
mControlContainer.removeOnLayoutChangeListener(mLayoutChangeListener);
mLayoutChangeListener = null;
}
-@@ -1227,13 +1232,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -1226,13 +1231,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
return mLocationBar.getOmniboxStub().isUrlBarFocused();
}
@@ -1363,7 +1363,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
mScrimCoordinator, mOmniboxFocusStateSupplier, mBottomSheetController,
mActivityLifecycleDispatcher, mIsWarmOnResumeSupplier, mTabModelSelector,
mTabContentManager, mCompositorViewHolder,
-@@ -1242,8 +1259,9 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -1241,8 +1258,9 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
mBottomControlsCoordinatorSupplier.set(
new BottomControlsCoordinator(mActivity, mWindowAndroid, mLayoutManager,
mCompositorViewHolder.getResourceManager(), mBrowserControlsSizer,
@@ -1375,7 +1375,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
}
/**
-@@ -1985,6 +2003,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -1984,6 +2002,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
private void setControlContainerTopMargin(int margin) {
final ViewGroup.MarginLayoutParams layoutParams =
((ViewGroup.MarginLayoutParams) mControlContainer.getLayoutParams());
diff --git a/build/patches/Multiple-fingerprinting-mitigations.patch b/build/patches/Multiple-fingerprinting-mitigations.patch
index 963e77ad..d71afee9 100644
--- a/build/patches/Multiple-fingerprinting-mitigations.patch
+++ b/build/patches/Multiple-fingerprinting-mitigations.patch
@@ -195,11 +195,10 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
#include "base/notreached.h"
#include "base/time/time.h"
#include "cc/animation/animation_host.h"
-@@ -2235,6 +2236,23 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() {
- #if DCHECK_IS_ON()
- AssertLayoutTreeUpdated(*this, true /* allow_dirty_container_subtrees */);
- #endif
-+
+@@ -810,6 +811,15 @@ Document::Document(const DocumentInit& initializer,
+ ? MakeGarbageCollected(*this)
+ : nullptr),
+ data_(MakeGarbageCollected(GetExecutionContext())) {
+ if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
+ // Precompute -0.0003% to 0.0003% noise factor for get*ClientRect*() fingerprinting
+ noise_factor_x_ = 1 + (base::RandDouble() - 0.5) * 0.000003;
@@ -208,17 +207,25 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
+ noise_factor_x_ = 1;
+ noise_factor_y_ = 1;
+ }
-+}
+
+ if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution))
+ script_runner_delayer_->Activate();
+
+@@ -2237,6 +2247,14 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() {
+ #endif
+ }
+
+double Document::GetNoiseFactorX() {
+ return noise_factor_x_;
+}
+
+double Document::GetNoiseFactorY() {
+ return noise_factor_y_;
- }
-
++}
++
void Document::InvalidateStyleAndLayoutForFontUpdates() {
+ DCHECK(IsActive());
+ DCHECK(IsMainThread());
diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h
--- a/third_party/blink/renderer/core/dom/document.h
+++ b/third_party/blink/renderer/core/dom/document.h
diff --git a/build/patches/Override-Navigator-Language.patch b/build/patches/Override-Navigator-Language.patch
index 7d92b87b..2f593ea2 100644
--- a/build/patches/Override-Navigator-Language.patch
+++ b/build/patches/Override-Navigator-Language.patch
@@ -4,6 +4,9 @@ Subject: Override Navigator Language
Uses the first of the accept-languages as the system language for blink
and fix the selection in the UI for the browser language
+
+Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../browser/language/AppLocaleUtils.java | 20 +++++++++++++++++++
.../AppLanguagePreferenceDelegate.java | 8 ++++++++
diff --git a/build/patches/Partition-blobs-by-top-frame-url.patch b/build/patches/Partition-blobs-by-top-frame-URL.patch
similarity index 97%
rename from build/patches/Partition-blobs-by-top-frame-url.patch
rename to build/patches/Partition-blobs-by-top-frame-URL.patch
index 3c809a6d..8c7c71ea 100644
--- a/build/patches/Partition-blobs-by-top-frame-url.patch
+++ b/build/patches/Partition-blobs-by-top-frame-URL.patch
@@ -1,9 +1,12 @@
From: uazo
Date: Tue, 20 Sep 2022 07:20:01 +0000
-Subject: Partition blobs by top frame url
+Subject: Partition blobs by top frame URL
-Verifies that the blob was created with the same top frame url
+Verifies that the blob was created with the same top frame URL
or, if not defined, by the same agent cluster.
+
+Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
storage/browser/blob/blob_url_store_impl.cc | 37 ++++++++++++++++++-
storage/browser/blob/blob_url_store_impl.h | 14 ++++++-
diff --git a/build/patches/Remove-http-referrals-in-cross-origin-navigation.patch b/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch
similarity index 90%
rename from build/patches/Remove-http-referrals-in-cross-origin-navigation.patch
rename to build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch
index c522f701..2963b722 100644
--- a/build/patches/Remove-http-referrals-in-cross-origin-navigation.patch
+++ b/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch
@@ -1,13 +1,12 @@
From: uazo
Date: Wed, 21 Sep 2022 12:28:17 +0000
-Subject: Remove http referrals in cross origin navigation
+Subject: Remove HTTP referrals in cross origin navigation
-The patch removes the referrals if the navigation is cross origin and occurs in the top frame.
-We do not remove the value between the iframes because the referrals are statically defined
-by the html and the javascript of the page, and therefore they do not say anything about the
+The patch removes the referrals if the navigation is cross-origin and occurs in the top frame.
+The value is not removed across iframes because the referrals are statically defined
+by the HTML and the Javascript of the page, and therefore they do not tell anything about the
user. Also, some services may not work, such as video iframes.
-We also added a flag that completely removes referrals management, for users who know
-what they are doing.
+A preference is also introduced to completely removes referrals management, for advanced users.
Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
@@ -58,9 +57,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
: R.string.text_off);
}
-+ ChromeSwitchPreference enableFeferrerPref = findPreference(PREF_ENABLE_REFERRERS);
-+ enableFeferrerPref.setChecked(prefService.getBoolean(Pref.ENABLE_REFERRERS));
-+ enableFeferrerPref.setOnPreferenceChangeListener(this);
++ ChromeSwitchPreference enableReferrerPref = findPreference(PREF_ENABLE_REFERRERS);
++ enableReferrerPref.setChecked(prefService.getBoolean(Pref.ENABLE_REFERRERS));
++ enableReferrerPref.setOnPreferenceChangeListener(this);
+
Preference preloadPagesPreference = findPreference(PREF_PRELOAD_PAGES);
if (preloadPagesPreference != null) {
diff --git a/build/patches/Remove-binary-blob-integrations.patch b/build/patches/Remove-binary-blob-integrations.patch
index 42955321..bd5317dd 100644
--- a/build/patches/Remove-binary-blob-integrations.patch
+++ b/build/patches/Remove-binary-blob-integrations.patch
@@ -1414,7 +1414,7 @@ diff --git a/components/component_updater/android/java/src/org/chromium/componen
diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
--- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
+++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
-@@ -2463,14 +2463,6 @@ public class ExternalNavigationHandler {
+@@ -2466,14 +2466,6 @@ public class ExternalNavigationHandler {
* @return Whether the given intent is going to open an Instant App.
*/
private static boolean isIntentToInstantApp(Intent intent) {
@@ -3439,7 +3439,7 @@ diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
-@@ -3069,10 +3069,6 @@ if (is_android) {
+@@ -3068,10 +3068,6 @@ if (is_android) {
testonly = true
sources = content_java_sources_needing_jni
deps = [
diff --git a/build/patches/Remove-navigator.connection-info.patch b/build/patches/Remove-navigator.connection-info.patch
index 368a5d4a..6d5ceb33 100644
--- a/build/patches/Remove-navigator.connection-info.patch
+++ b/build/patches/Remove-navigator.connection-info.patch
@@ -8,8 +8,10 @@ and disable observers
Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- .../blink/renderer/modules/netinfo/network_information.cc | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
+ .../renderer/modules/netinfo/network_information.cc | 5 ++++-
+ .../platform/network/network_state_notifier.cc | 11 +++++++++++
+ .../platform/network/network_state_notifier.h | 2 +-
+ 3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/third_party/blink/renderer/modules/netinfo/network_information.cc b/third_party/blink/renderer/modules/netinfo/network_information.cc
--- a/third_party/blink/renderer/modules/netinfo/network_information.cc
@@ -31,23 +33,54 @@ diff --git a/third_party/blink/renderer/modules/netinfo/network_information.cc b
DCHECK(GetExecutionContext()->IsContextThread());
const String host = Host();
-@@ -242,6 +243,8 @@ void NetworkInformation::ContextDestroyed() {
+@@ -242,6 +243,7 @@ void NetworkInformation::ContextDestroyed() {
}
void NetworkInformation::StartObserving() {
-+ //is_fake_observing_ = true;
+ if ((true)) return;
if (!IsObserving() && !context_stopped_) {
type_ = GetNetworkStateNotifier().ConnectionType();
DCHECK(!connection_observer_handle_);
-@@ -252,6 +255,8 @@ void NetworkInformation::StartObserving() {
+@@ -252,6 +254,7 @@ void NetworkInformation::StartObserving() {
}
void NetworkInformation::StopObserving() {
-+ //is_fake_observing_ = false;
+ if ((true)) return;
if (IsObserving()) {
DCHECK(connection_observer_handle_);
connection_observer_handle_ = nullptr;
+diff --git a/third_party/blink/renderer/platform/network/network_state_notifier.cc b/third_party/blink/renderer/platform/network/network_state_notifier.cc
+--- a/third_party/blink/renderer/platform/network/network_state_notifier.cc
++++ b/third_party/blink/renderer/platform/network/network_state_notifier.cc
+@@ -99,6 +99,17 @@ NetworkStateNotifier::ScopedNotifier::~ScopedNotifier() {
+ }
+ }
+
++NetworkStateNotifier::NetworkStateNotifier() : has_override_(false) {
++ // set default data
++ SetNetworkConnectionInfoOverride(
++ /*on_line*/ true,
++ /*type*/ WebConnectionType::kWebConnectionTypeWifi,
++ /*effective_type*/ absl::nullopt,
++ /*http_rtt_msec*/ 0,
++ /*max_bandwidth_mbps*/ std::numeric_limits::max());
++ SetNetworkQuality(/*effective_type*/ WebEffectiveConnectionType::kType4G, base::TimeDelta(), base::TimeDelta(), 10000);
++}
++
+ NetworkStateNotifier::NetworkStateObserverHandle::NetworkStateObserverHandle(
+ NetworkStateNotifier* notifier,
+ NetworkStateNotifier::ObserverType type,
+diff --git a/third_party/blink/renderer/platform/network/network_state_notifier.h b/third_party/blink/renderer/platform/network/network_state_notifier.h
+--- a/third_party/blink/renderer/platform/network/network_state_notifier.h
++++ b/third_party/blink/renderer/platform/network/network_state_notifier.h
+@@ -122,7 +122,7 @@ class PLATFORM_EXPORT NetworkStateNotifier {
+ scoped_refptr task_runner_;
+ };
+
+- NetworkStateNotifier() : has_override_(false) {}
++ NetworkStateNotifier();
+ NetworkStateNotifier(const NetworkStateNotifier&) = delete;
+ NetworkStateNotifier& operator=(const NetworkStateNotifier&) = delete;
+
--
2.25.1
diff --git a/build/patches/Remove-price-shopping-commerce-integrations.patch b/build/patches/Remove-price-shopping-commerce-integrations.patch
index 2fddef00..8f513ff6 100644
--- a/build/patches/Remove-price-shopping-commerce-integrations.patch
+++ b/build/patches/Remove-price-shopping-commerce-integrations.patch
@@ -556,7 +556,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
private ThumbnailProvider mThumbnailProvider;
private boolean mActionsOnAllRelatedTabs;
-@@ -554,7 +504,6 @@ class TabListMediator {
+@@ -559,7 +509,6 @@ class TabListMediator {
* @param gridCardOnClickListenerProvider Provides the onClickListener for opening dialog when
* click on a grid card.
* @param dialogHandler A handler to handle requests about updating TabGridDialog.
@@ -564,7 +564,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
* @param componentName This is a unique string to identify different components.
* @param uiType The type of UI this mediator should be building.
*/
-@@ -565,7 +514,6 @@ class TabListMediator {
+@@ -570,7 +519,6 @@ class TabListMediator {
@Nullable SelectionDelegateProvider selectionDelegateProvider,
@Nullable GridCardOnClickListenerProvider gridCardOnClickListenerProvider,
@Nullable TabGridDialogHandler dialogHandler,
@@ -572,7 +572,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
String componentName, @UiType int uiType) {
mContext = context;
mTabModelSelector = tabModelSelector;
-@@ -580,7 +528,6 @@ class TabListMediator {
+@@ -585,7 +533,6 @@ class TabListMediator {
mTabGridDialogHandler = dialogHandler;
mActionsOnAllRelatedTabs = actionOnRelatedTabs;
mUiType = uiType;
@@ -580,7 +580,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
mTabModelObserver = new TabModelObserver() {
@Override
-@@ -761,35 +708,6 @@ class TabListMediator {
+@@ -766,35 +713,6 @@ class TabListMediator {
mTabGridItemTouchHelperCallback = new TabGridItemTouchHelperCallback(context, mModel,
mTabModelSelector, mTabClosedListener, mTabGridDialogHandler, mComponentName,
mActionsOnAllRelatedTabs, mMode);
@@ -616,7 +616,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
}
public void initWithNative(Profile profile) {
-@@ -1178,9 +1096,6 @@ class TabListMediator {
+@@ -1183,9 +1101,6 @@ class TabListMediator {
Collections.sort(tabsList, LAST_SHOWN_COMPARATOR);
}
mVisible = tabsList != null;
@@ -626,7 +626,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
if (areTabsUnchanged(tabsList)) {
if (tabsList == null) return true;
for (int i = 0; i < tabsList.size(); i++) {
-@@ -1721,34 +1636,6 @@ class TabListMediator {
+@@ -1726,34 +1641,6 @@ class TabListMediator {
}
private void setupPersistedTabDataFetcherForTab(PseudoTab pseudoTab, int index) {
@@ -661,7 +661,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
}
@VisibleForTesting
-@@ -1856,23 +1743,6 @@ class TabListMediator {
+@@ -1861,23 +1748,6 @@ class TabListMediator {
return false;
}
@@ -685,7 +685,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
/**
* Update the layout of tab switcher to make it compact. Because now we have messages within the
* tabs like PriceMessage and these messages take up the entire row, some operations like
-@@ -1883,7 +1753,7 @@ class TabListMediator {
+@@ -1888,7 +1758,7 @@ class TabListMediator {
void updateLayout() {
// Right now we need to update layout only if there is a price welcome message card in tab
// switcher.
@@ -694,7 +694,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
assert mGridLayoutManager != null;
int spanCount = mGridLayoutManager.getSpanCount();
GridLayoutManager.SpanSizeLookup spanSizeLookup = mGridLayoutManager.getSpanSizeLookup();
-@@ -1975,25 +1845,4 @@ class TabListMediator {
+@@ -1980,25 +1850,4 @@ class TabListMediator {
private boolean isShowingTabsInMRUOrder() {
return TabSwitcherCoordinator.isShowingTabsInMRUOrder(mMode);
}
@@ -1837,7 +1837,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
-@@ -1892,27 +1891,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -1891,27 +1890,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
}
private void maybeShowPriceDropIPH() {
diff --git a/build/patches/Remove-signin-and-sync-integrations.patch b/build/patches/Remove-signin-and-sync-integrations.patch
index 7f4627bb..14f5f188 100644
--- a/build/patches/Remove-signin-and-sync-integrations.patch
+++ b/build/patches/Remove-signin-and-sync-integrations.patch
@@ -3575,7 +3575,7 @@ diff --git a/chrome/browser/first_run/android/java/src/org/chromium/chrome/brows
diff --git a/chrome/browser/media/router/discovery/access_code/BUILD.gn b/chrome/browser/media/router/discovery/access_code/BUILD.gn
--- a/chrome/browser/media/router/discovery/access_code/BUILD.gn
+++ b/chrome/browser/media/router/discovery/access_code/BUILD.gn
-@@ -55,7 +55,6 @@ if (!is_android) {
+@@ -57,7 +57,6 @@ if (!is_android) {
"//chrome/browser/media/router/discovery:discovery",
"//chrome/browser/media/router/discovery/access_code:discovery_resources_proto",
"//chrome/browser/profiles:profile",
diff --git a/build/patches/Remove-voice-recognition-integration.patch b/build/patches/Remove-voice-recognition-integration.patch
index eb118990..f572b7e4 100644
--- a/build/patches/Remove-voice-recognition-integration.patch
+++ b/build/patches/Remove-voice-recognition-integration.patch
@@ -482,7 +482,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
import org.chromium.chrome.browser.page_info.ChromePageInfo;
import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
-@@ -1953,11 +1952,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -1952,11 +1951,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
return mLocationBar.getOmniboxStub();
}
diff --git a/build/patches/Restore-Simplified-NTP-launch.patch b/build/patches/Restore-Simplified-NTP-launch.patch
index 812d08a2..f8d945c4 100644
--- a/build/patches/Restore-Simplified-NTP-launch.patch
+++ b/build/patches/Restore-Simplified-NTP-launch.patch
@@ -421,7 +421,7 @@ diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/featu
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
--- a/testing/variations/fieldtrial_testing_config.json
+++ b/testing/variations/fieldtrial_testing_config.json
-@@ -4701,6 +4701,24 @@
+@@ -4731,6 +4731,24 @@
]
}
],
diff --git a/build/patches/Revert-Delete-block-external-form-redirects.patch b/build/patches/Revert-Delete-block-external-form-redirects.patch
index d8398483..50d0c467 100644
--- a/build/patches/Revert-Delete-block-external-form-redirects.patch
+++ b/build/patches/Revert-Delete-block-external-form-redirects.patch
@@ -192,7 +192,7 @@ diff --git a/components/external_intents/android/javatests/src/org/chromium/comp
}
@Test
-@@ -2835,6 +2833,11 @@ public class ExternalNavigationHandlerTest {
+@@ -2841,6 +2839,11 @@ public class ExternalNavigationHandlerTest {
&& !packageName.equals(INVALID_WEBAPK_PACKAGE_NAME);
}
diff --git a/build/patches/Update-i18n-zh_CN-support.patch b/build/patches/Update-i18n-zh_CN-support.patch
index cb4b6828..c52dd424 100644
--- a/build/patches/Update-i18n-zh_CN-support.patch
+++ b/build/patches/Update-i18n-zh_CN-support.patch
@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb
--- a/chrome/app/resources/generated_resources_zh-CN.xtb
+++ b/chrome/app/resources/generated_resources_zh-CN.xtb
-@@ -8558,4 +8558,6 @@
+@@ -8557,4 +8557,6 @@
查看与亲朋好友相聚时刻的回忆集锦
您需要开启 Chrome 同步才能使用 Wi-Fi 同步功能。了解详情
检查(&N)
diff --git a/build/patches/Welcome-screen.patch b/build/patches/Welcome-screen.patch
index e22b849a..e093613e 100644
--- a/build/patches/Welcome-screen.patch
+++ b/build/patches/Welcome-screen.patch
@@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ChildA
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
-@@ -31,8 +31,6 @@ import org.chromium.chrome.browser.customtabs.CustomTabActivity;
+@@ -32,8 +32,6 @@ import org.chromium.chrome.browser.customtabs.CustomTabActivity;
import org.chromium.chrome.browser.fonts.FontPreloader;
import org.chromium.chrome.browser.metrics.UmaUtils;
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
@@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
import org.chromium.ui.base.LocalizationUtils;
import org.chromium.ui.modaldialog.ModalDialogManager;
-@@ -144,18 +142,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+@@ -145,18 +143,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
/** Creates first page and sets up adapter. Should result UI being shown on the screen. */
private void createFirstPage() {
BooleanSupplier showWelcomePage = () -> !FirstRunStatus.shouldSkipWelcomePage();
@@ -97,7 +97,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
mFreProgressStates.add(MobileFreProgress.WELCOME_SHOWN);
mPagerAdapter = new FirstRunPagerAdapter(FirstRunActivity.this, mPages);
mPager.setAdapter(mPagerAdapter);
-@@ -163,15 +150,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+@@ -164,15 +151,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
// native and policy service have been initialized.
}
@@ -113,7 +113,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
/**
* Create the page sequence which requires native initialized, and policies loaded if any
* on-device policies may exists.
-@@ -185,7 +163,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+@@ -186,7 +164,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
BooleanSupplier showSearchEnginePromo =
() -> mFreProperties.getBoolean(SHOW_SEARCH_ENGINE_PAGE);
@@ -121,7 +121,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
// An optional page to select a default search engine.
if (showSearchEnginePromo.getAsBoolean()) {
-@@ -194,11 +171,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+@@ -195,11 +172,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
mFreProgressStates.add(MobileFreProgress.DEFAULT_SEARCH_ENGINE_SHOWN);
}
@@ -133,7 +133,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
if (mPagerAdapter != null) {
mPagerAdapter.notifyDataSetChanged();
}
-@@ -243,10 +215,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+@@ -244,10 +216,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
@Override
public void triggerLayoutInflation() {
@@ -144,7 +144,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
super.triggerLayoutInflation();
initializeStateFromLaunchData();
-@@ -256,7 +224,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+@@ -257,7 +225,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
setFinishOnTouchOutside(true);
setContentView(createContentView());
@@ -153,7 +153,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
// SigninFirstRunFragment doesn't use getProperties() and can be shown right away,
// without waiting for FirstRunFlowSequencer.
createFirstPage();
-@@ -528,10 +496,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+@@ -529,10 +497,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
public void acceptTermsOfService(boolean allowCrashUpload) {
assert mNativeSideIsInitializedSupplier.hasValue();
diff --git a/build/ruleset_converter.gn_args b/build/ruleset_converter.gn_args
index 17284f62..050db13e 100644
--- a/build/ruleset_converter.gn_args
+++ b/build/ruleset_converter.gn_args
@@ -21,7 +21,6 @@ enable_platform_dolby_vision=true
enable_platform_hevc=true
enable_remoting=false
enable_reporting=false
-enable_supervised_users=false
enable_vr=false
exclude_unwind_tables=false
ffmpeg_branding="Chrome"