Skip to content

Commit

Permalink
Merge pull request #15424 from brave/106.0.5249.119_1.45.x
Browse files Browse the repository at this point in the history
Upgrade from Chromium 106.0.5249.103 to Chromioum 106.0.5249.119 (1.45.x)
  • Loading branch information
kjozwiak authored Oct 12, 2022
2 parents cdedf13 + faf1aab commit 89ddf2e
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1263,7 +1263,7 @@ private boolean isMenuButtonOnBottom() {
}

@Override
protected void initialize(ToolbarDataProvider toolbarDataProvider,
public void initialize(ToolbarDataProvider toolbarDataProvider,
ToolbarTabController tabController, MenuButtonCoordinator menuButtonCoordinator,
ObservableSupplier<Boolean> isProgressBarVisibleSupplier,
HistoryDelegate historyDelegate, BooleanSupplier partnerHomepageEnabledSupplier,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ bool ParseCertificatesFile(base::StringPiece certs_input,
Pinsets* pinsets,
base::Time* timestamp) {
base::StringPiece brave_certs = R"brave_certs(
# Last updated: Thu Oct 6 01:41:37 UTC 2022
# Last updated: Tue Oct 11 23:53:32 UTC 2022
PinsListTimestamp
1665020497
1665532412
# =====BEGIN BRAVE ROOTS ASC=====
#From https://www.amazontrust.com/repository/
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "106.0.5249.103",
"tag": "106.0.5249.119",
"repository": {
"url": "https://github.com/chromium/chromium"
}
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-VERSION.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index 8de18d00b9897af93439730198cd7ba70c0f2494..4c02ed8e150d1f01505df5ef2a30de125a09beec 100644
index 19e97c6be926c5667d2ef5d84e50275f2a64daa3..adec05a8c36c07578cdf6aa8b50dce27d75fb2cb 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=106
-MINOR=0
-BUILD=5249
-PATCH=103
-PATCH=119
+MINOR=1
+BUILD=45
+PATCH=97
Original file line number Diff line number Diff line change
@@ -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 1da8855b710eadd167f39d8582fa360c44a0e4a8..4a76c8e55b8476b8a6b5f040f40b8c9dcf20ceff 100644
index 7b709b6ac90bd0c127382db5e22b108e1623b326..8d80fa99cb05345f65f62d6534b83a552175a846 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
@@ -353,10 +353,12 @@ public class ToolbarTablet
Expand Down

0 comments on commit 89ddf2e

Please sign in to comment.