Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade patches from Chromium 84.0.4147.68 to Chromium 84.0.4147.85 (1.11.x). #6054

Merged
merged 1 commit into from
Jul 9, 2020
Merged

Upgrade patches from Chromium 84.0.4147.68 to Chromium 84.0.4147.85 (1.11.x). #6054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions patches/chrome-VERSION.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index a38b5b4de3a0c0a4cfe3420e2c6441dc4f8c6f84..7e8f87fda49d550acf1842cc7bab80f6c267c571 100644
index 6faaeaac3742aee514438a76495b039610106bc4..da2cccbb6af968236e4619bd03b6cdcc0731fef7 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=84
-MINOR=0
-BUILD=4147
-PATCH=68
-PATCH=85
+MINOR=1
+BUILD=11
+PATCH=93
2 changes: 1 addition & 1 deletion patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeActivity.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
index c35d53ca79a7b35fe39e4ca63e2c0c394a7f46a6..cfb2eabf2c9230895cf0c3df3719a7729dbf4089 100644
index 19c058b70c0a9ff9f8f64979bdeed9dfcc579361..4887017c24ec3e30d3a82ba1d7e9f98030023dec 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -314,7 +314,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
Expand Down
6 changes: 3 additions & 3 deletions patches/chrome-browser-prefs-browser_prefs.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 3d91429900b49950a4b858e8f2073330447a20fc..71952ce6d617b7136c4fbec768d793ac847cf593 100644
index 3d00fae9dc14418a6363bda08c3abcbcc0f94757..9e9efa8cd09d39ee7921edc4c1bec90ed2f06b73 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -819,6 +819,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -829,6 +829,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
#if defined(TOOLKIT_VIEWS)
RegisterBrowserViewLocalPrefs(registry);
#endif
+ brave::RegisterLocalStatePrefs(registry);

RegisterLocalStatePrefsForMigration(registry);
}
@@ -1087,6 +1088,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1097,6 +1098,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
#endif

RegisterProfilePrefsForMigration(registry);
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-browser-ui-tab_helpers.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
index b50ee51bb2b8fc35418820e1c1955975e60a597e..ac5b99f5f744b6f2e01a20bfcda5f8d195c61708 100644
index 01ec84c644f83657a87684afbd38d6f670364d96..d9451960f96fe40d737c42b54e0411e80cf92a03 100644
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -466,4 +466,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
@@ -467,4 +467,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {

// This is common code for all of us. PLEASE DO YOUR PART to keep it tidy and
// organized.
Expand Down
2 changes: 1 addition & 1 deletion patches/content-browser-frame_host-navigation_request.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
index 711e4b02b7e0b401deb25380af453a332fb5c4e3..090220f49b7e154946bafffa550cb28f372f90a0 100644
index baf19ee3bae8aba96965ddcf42858094df578722..614a681faac5833fa0c04cace96179c8616ff006 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -2533,6 +2533,7 @@ void NavigationRequest::OnStartChecksComplete(
Expand Down
4 changes: 2 additions & 2 deletions patches/tools-metrics-histograms-histograms.xml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 1c73e36e78edb7d358c09917518fec0355bb6757..90058c4ffcd8340a9161f320163d5b5e73451a2c 100644
index befef0d7b454548647ce793e46292d2e77cc8ec9..c15dcdb6ac22c5aaf493ad10ca6793383d487f27 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -201970,6 +201970,7 @@ regressions. -->
@@ -201990,6 +201990,7 @@ regressions. -->
<suffix name="ProtectedMedia" label="Protected media permission"/>
<suffix name="PushMessaging" label="Push messaging permission"/>
<suffix name="Quota" label="Quota permission"/>
Expand Down