Skip to content

Upgrade from Chromium 129.0.6668.89 to Chromium 129.0.6668.100 (1.70.x) #25893

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

Merged
merged 2 commits into from
Oct 9, 2024
Merged

Upgrade from Chromium 129.0.6668.89 to Chromium 129.0.6668.100 (1.70.x) #25893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf52209
Upgrade from Chromium 129.0.6668.89 to Chromium 129.0.6668.100
brave-builds Oct 8, 2024
9d25565
Update pins list timestamp
brave-builds Oct 8, 2024
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 chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,9 +550,9 @@ bool ParseCertificatesFile(std::string_view certs_input,
Pinsets* pinsets,
base::Time* timestamp) {
constexpr std::string_view brave_certs = R"brave_certs(
# Last updated: Wed Oct 2 00:46:08 UTC 2024
# Last updated: Tue Oct 8 20:42:58 UTC 2024
PinsListTimestamp
1727829968
1728420178

# =====BEGIN BRAVE ROOTS ASC=====
#From https://www.amazontrust.com/repository/
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "129.0.6668.89",
"tag": "129.0.6668.100",
"repository": {
"url": "https://github.com/brave/chromium"
}
Expand Down
11 changes: 1 addition & 10 deletions ...hes/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.html.ts.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts
index fd4c6fd187a8e9e09530f92a9350e62a0d1044c0..5625b10b4b7643733902926d02ce4533e0431d01 100644
index c0f4e262a9e11de91b01bd77676367bdcc026aec..5625b10b4b7643733902926d02ce4533e0431d01 100644
--- a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts
+++ b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts
@@ -25,7 +25,7 @@ export function getHtml(this: ProfilePickerMainViewElement) {
Expand All @@ -11,12 +11,3 @@ index fd4c6fd187a8e9e09530f92a9350e62a0d1044c0..5625b10b4b7643733902926d02ce4533
@click="${this.onAddProfileClick_}"
aria-labelledby="addProfileButtonLabel">
<div id="addProfileButtonLabel"
@@ -44,7 +44,7 @@ export function getHtml(this: ProfilePickerMainViewElement) {
$i18n{browseAsGuestButton}
</cr-button>
<cr-checkbox id="askOnStartup" ?checked="${this.askOnStartup_}"
- @change="${this.onAskOnStartupChangedByUser_}"
+ @checked-changed="${this.onAskOnStartupChangedByUser_}"
?hidden="${this.hideAskOnStartup_}">
$i18n{askOnStartupCheckboxText}
</cr-checkbox>
18 changes: 1 addition & 17 deletions patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts
index 343bf676b41d1ad35d5774403777432a335224f4..74f64b357712d0a38daf74f91d4be876c7a0bc31 100644
index 06a1ba4adc4cb1f8ae9afbfa4576a8a2bac9efed..74f64b357712d0a38daf74f91d4be876c7a0bc31 100644
--- a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts
+++ b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts
@@ -106,6 +106,7 @@ export class ProfilePickerMainViewElement extends
Expand All @@ -10,19 +10,3 @@ index 343bf676b41d1ad35d5774403777432a335224f4..74f64b357712d0a38daf74f91d4be876

this.addEventListener('view-enter-finish', this.onViewEnterFinish_);

@@ -212,12 +213,13 @@ export class ProfilePickerMainViewElement extends
/**
* Called when the user modifies 'Ask on startup' preference.
*/
- protected onAskOnStartupChangedByUser_() {
+ protected onAskOnStartupChangedByUser_(e: CustomEvent<{value: boolean}>) {
if (this.hideAskOnStartup_) {
return;
}

- this.manageProfilesBrowserProxy_.askOnStartupChanged(this.askOnStartup_);
+ this.askOnStartup_ = e.detail.value;
+ this.manageProfilesBrowserProxy_.askOnStartupChanged(e.detail.value);
}

protected onAddProfileClick_() {
Loading