-
Notifications
You must be signed in to change notification settings - Fork 868
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2976 from brave/76.0.3809.72
Upgrade patches from Chromium 76.0.3809.62 to Chromium 76.0.3809.72
- Loading branch information
Showing
17 changed files
with
211 additions
and
189 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
diff --git a/chrome/VERSION b/chrome/VERSION | ||
index e05d1f3aaf621bae4c2448a8dd9ee80a90b2321b..2479fb78506bd9e02b134c7ef863bc906d8cf7a1 100644 | ||
index 556db09bacc7ecdd8fefe44172fcd20866c2c7fc..a8338936b516704ccc7f723788a24129fdf559fb 100644 | ||
--- a/chrome/VERSION | ||
+++ b/chrome/VERSION | ||
@@ -1,4 +1,4 @@ | ||
MAJOR=76 | ||
MINOR=0 | ||
-BUILD=3809 | ||
-PATCH=62 | ||
-PATCH=72 | ||
+BUILD=67 | ||
+PATCH=117 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
diff --git a/chrome/installer/mac/sign_chrome.py b/chrome/installer/mac/sign_chrome.py | ||
index fa3a88200f5156975d0da5bcc52ed6f9896e792e..9068adc58127d24f50f47b3f1f939e2b6feaef69 100755 | ||
--- a/chrome/installer/mac/sign_chrome.py | ||
+++ b/chrome/installer/mac/sign_chrome.py | ||
@@ -28,6 +28,7 @@ def create_config(config_args, development): | ||
An instance of |model.CodeSignConfig|. | ||
""" | ||
config_class = config.CodeSignConfig | ||
+ """ | ||
try: | ||
import signing.internal_config | ||
config_class = signing.internal_config.InternalCodeSignConfig | ||
@@ -36,6 +37,7 @@ def create_config(config_args, development): | ||
# internal config has to be available. | ||
if config_class(identity, keychain).product == 'Google Chrome': | ||
raise e | ||
+ """ | ||
|
||
if development: | ||
|
||
@@ -55,6 +57,8 @@ def create_config(config_args, development): | ||
|
||
config_class = DevelopmentCodeSignConfig | ||
|
||
+ from signing_helper import GetBraveSigningConfig | ||
+ config_class = GetBraveSigningConfig(config_class, development) | ||
return config_class(*config_args) | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.