Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conflict-resolved patches from Chromium 94.0.4595.3 to Chromium 94.0.4603.0

Browse Source
This commit is contained in:
Mario Sanchez Prada
2021-09-13 14:53:24 -04:00
committed by mkarolin
parent 5f43e5e798
commit 24e269732f
7 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/chrome-VERSION.patch
+3 -3
View File
@@ -1,12 +1,12 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index 649e6c5875a86ebe53f7fc89361c7aad17dd72bc..6180c51e59c5324840dab7692de482b161368948 100644
index 4b6a5be4d87dbf5bff181f9552d23b0c6ad22170..6180c51e59c5324840dab7692de482b161368948 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=94
-MINOR=0
-BUILD=4595
-PATCH=3
-BUILD=4603
-PATCH=0
+MINOR=1
+BUILD=31
+PATCH=36
patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate.h.patch
+5 -5
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
index cdc212600be6a6c771e0c01294f128f3ce620bfe..deaeeead20fb9f7cc852fef04de1f990f3965353 100644
index 513a64cc3f34e4b9a88fe6fb1776fc2d60d1819e..e2e30875bd1b7e7aea88172b6fded4700c42865a 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
@@ -82,6 +82,7 @@ class ChromeBrowsingDataRemoverDelegate
@@ -10,12 +10,12 @@ index cdc212600be6a6c771e0c01294f128f3ce620bfe..deaeeead20fb9f7cc852fef04de1f990
private:
using WebRtcEventLogManager = webrtc_event_logging::WebRtcEventLogManager;
@@ -129,7 +130,8 @@ class ChromeBrowsingDataRemoverDelegate
kAccountPasswordsSynced = 38,
@@ -130,7 +131,8 @@ class ChromeBrowsingDataRemoverDelegate
kAccountCompromisedCredentials = 39,
kFaviconCacheExpiration = 40,
- kMaxValue = kFaviconCacheExpiration,
+ kIPFSCache = 41,
kSecurePaymentConfirmationInstruments = 41,
- kMaxValue = kSecurePaymentConfirmationInstruments,
+ kIPFSCache = 42,
+ kMaxValue = kIPFSCache,
};
patches/chrome-browser-resources-settings-about_page-about_page.js.patch
+4 -4
View File
@@ -1,18 +1,18 @@
diff --git a/chrome/browser/resources/settings/about_page/about_page.js b/chrome/browser/resources/settings/about_page/about_page.js
index 14e8d1b3fc83229f54ee10d7bb15e2f278e94e69..23beadf6cf8cf751a487b308e1dcb599aeab4af5 100644
index 0a0e71d43d63510c31a1b61ad8fdacf4601f4c1f..b1c7410c27865457b93e92990e7886aa8c9f6824 100644
--- a/chrome/browser/resources/settings/about_page/about_page.js
+++ b/chrome/browser/resources/settings/about_page/about_page.js
@@ -229,7 +229,14 @@ export class SettingsAboutPageElement extends SettingsAboutPageElementBase {
@@ -226,7 +226,14 @@ export class SettingsAboutPageElement extends SettingsAboutPageElementBase {
/** @private */
onRelaunchTap_() {
+ // <if expr="is_macosx">
+ // Sparkle framework's relaunch api is used.
+ this.lifetimeBrowserProxy_.relaunchOnMac();
+ LifetimeBrowserProxyImpl.getInstance().relaunchOnMac();
+ // </if>
+
+ // <if expr="not is_macosx">
this.lifetimeBrowserProxy_.relaunch();
LifetimeBrowserProxyImpl.getInstance().relaunch();
+ // </if>
}
patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch
+10 -10
View File
@@ -1,24 +1,24 @@
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
index c091e104c7bc3d5c2478ffbbf1d1ecfb50e7c922..23b49119d2b6cda93a2a5edfa41952a736a19b31 100644
index 283be0fcc6e5758175c251fc2bcb3d8e9e7e3895..4f711cd1142d9666a3861a384ec2320d1d2030a4 100644
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
@@ -406,6 +406,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
@@ -403,6 +403,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
if (mCurrentLocationBarColor == color) return;
mCurrentLocationBarColor = color;
mLocationBarBackground.setColorFilter(color, PorterDuff.Mode.SRC_IN);
mLocationBarBackground.setTint(color);
+ BraveToolbarLayout.class.cast(this).updateModernLocationBarColorImpl(color);
}
/**
@@ -523,6 +524,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
@@ -520,6 +521,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED);
}
}
+ BraveToolbarLayout.class.cast(this).onClickImpl(v);
}
@Override
@@ -697,7 +699,8 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
@@ -694,7 +696,8 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
* @return The right bounds of the location bar after accounting for any visible right buttons.
*/
private int getBoundsAfterAccountingForRightButtons() {
@@ -27,12 +27,12 @@ index c091e104c7bc3d5c2478ffbbf1d1ecfb50e7c922..23b49119d2b6cda93a2a5edfa41952a7
+ if (mStartSurfaceScrollFraction == 1.0f) return mToolbarSidePadding;
return Math.max(mToolbarSidePadding, mToolbarButtonsContainer.getMeasuredWidth());
}
@@ -2114,6 +2117,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
@@ -2112,6 +2115,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
} else {
populateUrlClearExpansionAnimatorSet(animators);
}
+ BraveToolbarLayout.class.cast(this).populateUrlAnimatorSetImpl(hasFocus, URL_FOCUS_TOOLBAR_BUTTONS_DURATION_MS, URL_CLEAR_FOCUS_TABSTACK_DELAY_MS, animators);
mUrlFocusLayoutAnimator = new AnimatorSet();
mUrlFocusLayoutAnimator.playTogether(animators);
patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
index 18806a1d7d5edb7a61a59b01c9a6485d25295aa7..1b9491d2b32cf05d673e7e3e77843dff79a46301 100644
index e081307e04b78e7c7f7187f3d89ffe8b6450139c..655dcc674086087a822412282ab2311fe6919597 100644
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
@@ -326,10 +326,12 @@ public class ToolbarTablet extends ToolbarLayout
patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/components/browser_ui/widget/android/java/res/values/dimens.xml b/components/browser_ui/widget/android/java/res/values/dimens.xml
index 19b1cdc5576988473782340b246283e07b89ccf2..932e9757267fabafee90bad6ba469b5e120ac28c 100644
index be72ffa6c43bbe92bf7e0a7909910d9bb63f0279..656143765257b06790f8cd30138b130ec5cfba77 100644
--- a/components/browser_ui/widget/android/java/res/values/dimens.xml
+++ b/components/browser_ui/widget/android/java/res/values/dimens.xml
@@ -65,7 +65,7 @@
@@ -8,6 +8,6 @@ index 19b1cdc5576988473782340b246283e07b89ccf2..932e9757267fabafee90bad6ba469b5e
24dp is needed to completely round the corners. -->
- <dimen name="modern_toolbar_background_corner_radius">24dp</dimen>
+ <dimen name="modern_toolbar_background_corner_radius">8dp</dimen>
<dimen name="toolbar_text_box_elevation">@dimen/default_elevation_2</dimen>
<!-- Promo cards dimensions -->
<dimen name="promo_image_size">24dp</dimen>
patches/components-content_settings-renderer-content_settings_agent_impl.h.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/content_settings/renderer/content_settings_agent_impl.h b/components/content_settings/renderer/content_settings_agent_impl.h
index b018a8b9149ac4732c06eb95620c283fb60e58cd..0b9a1b3b1522d08cbd6954d1ad331696ec26cbc1 100644
index 856e4549b40b9e9b9218ec2ed17ecd731b57e493..8c159aa6793871dbf94ec2b794f704047192adc0 100644
--- a/components/content_settings/renderer/content_settings_agent_impl.h
+++ b/components/content_settings/renderer/content_settings_agent_impl.h
@@ -118,6 +118,7 @@ class ContentSettingsAgentImpl