Skip to content

Commit

Permalink
Release 92.0.4515.134
Browse files Browse the repository at this point in the history
  • Loading branch information
csagan5 committed Aug 5, 2021
1 parent b9a07b2 commit 63d8163
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# 92.0.4515.134

# 92.0.4515.125
* replace patch for missing API keys warning
* fix subresource filter not working (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1299)
Expand Down
2 changes: 1 addition & 1 deletion build/RELEASE
Original file line number Diff line number Diff line change
@@ -1 +1 @@
92.0.4515.125
92.0.4515.134
10 changes: 5 additions & 5 deletions build/patches/Automated-domain-substitution.patch
Original file line number Diff line number Diff line change
Expand Up @@ -4573,7 +4573,7 @@ diff --git a/chrome/browser/cart/cart_discount_link_fetcher.cc b/chrome/browser/
diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_service.cc
--- a/chrome/browser/cart/cart_service.cc
+++ b/chrome/browser/cart/cart_service.cc
@@ -449,7 +449,7 @@ void CartService::AddCartsWithFakeData() {
@@ -473,7 +473,7 @@ void CartService::AddCartsWithFakeData() {
// Polulate and add some carts with fake data.
double time_now = base::Time::Now().ToDoubleT();
cart_db::ChromeCartContentProto dummy_proto1;
Expand All @@ -4582,7 +4582,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv
dummy_proto1.set_key(std::string(kFakeDataPrefix) + eTLDPlusOne(dummy_url1));
dummy_proto1.set_merchant("Cart Foo");
dummy_proto1.set_merchant_cart_url(dummy_url1.spec());
@@ -458,17 +458,17 @@ void CartService::AddCartsWithFakeData() {
@@ -482,17 +482,17 @@ void CartService::AddCartsWithFakeData() {
l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_AMOUNT,
u"15%"));
dummy_proto1.add_product_image_urls(
Expand Down Expand Up @@ -24453,7 +24453,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
@@ -4346,7 +4346,7 @@ NavigationRequest::CheckCredentialedSubresource() const {
@@ -4347,7 +4347,7 @@ NavigationRequest::CheckCredentialedSubresource() const {
const char* console_message =
"Subresource requests whose URLs contain embedded credentials (e.g. "
"`https://user:pass@host/`) are blocked. See "
Expand All @@ -24462,7 +24462,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows
"details.";
parent->AddMessageToConsole(blink::mojom::ConsoleMessageLevel::kWarning,
console_message);
@@ -4374,7 +4374,7 @@ NavigationRequest::CheckLegacyProtocolInSubresource() const {
@@ -4375,7 +4375,7 @@ NavigationRequest::CheckLegacyProtocolInSubresource() const {
const char* console_message =
"Subresource requests using legacy protocols (like `ftp:`) are blocked. "
"Please deliver web-accessible resources over modern protocols like "
Expand All @@ -24471,7 +24471,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows
"details.";
parent->AddMessageToConsole(blink::mojom::ConsoleMessageLevel::kWarning,
console_message);
@@ -4606,7 +4606,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck(
@@ -4607,7 +4607,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck(
base::StringPrintf(
"Navigating a cross-origin opener to a download (%s) is "
"deprecated, see "
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1967,7 +1967,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
- findPreference(PREF_GOOGLE_SERVICES).setVisible(true);
- }
-
new AdaptiveToolbarStatePredictor().recomputeUiState(uiState -> {
new AdaptiveToolbarStatePredictor(null).recomputeUiState(uiState -> {
// We don't show the toolbar shortcut settings page if disabled from finch.
// Note, we can still have the old data collection experiment running for which
@@ -227,9 +164,6 @@ public class MainSettings extends PreferenceFragmentCompat
Expand Down

0 comments on commit 63d8163

Please sign in to comment.