Upgrade from Chromium 88.0.4315.7 to Chromium 88.0.4324.51. #7408
Conversation
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
23 tasks
mariospr
force-pushed
the
cr88
branch
3 times, most recently
from
97d10e0 to
cead120
Compare
mkarolin
changed the title
mkarolin
requested review from
iefremov,
samartnik,
simonhong,
tmancey and
a team
as code owners
tmancey
reviewed
Dec 17, 2020
| @@ -403,9 +403,6 @@ void AdNotificationViewMD::UpdateControlButtonsVisibilityWithNotification( | |||
| UpdateControlButtonsVisibility(); | |||
| } | |||
|
|
|||
| void AdNotificationViewMD::ButtonPressed(views::Button* sender, | |||
There was a problem hiding this comment.
Were changes in ui/brave_ads intentional as these will likely break ads?
There was a problem hiding this comment.
Yes, these are due to the Chromium change: https://chromium.googlesource.com/chromium/src/+/37cb433bb3d86231ee0c37cdd8a08f31ab35f172 (views::ButtonListener has been removed).
mkarolin
changed the title
mariospr
force-pushed
the
cr88
branch
4 times, most recently
from
886c639 to
7943ccb
Compare
Added: - /usr/lib/swift - @executable_path/../Frameworks This to get around the error: brave_rewards_ios_tests.app (22597) encountered an error (Early unexpected exit, operation never finished bootstrapping - no restart will be attempted. (Underlying Error: Crash: brave_rewards_ios_tests (22597): dyld: Using shared cache: 59E5DB8B-B935-310F-81BF-FB7488068748 Library not loaded: @rpath/libswiftCore.dylib
mkarolin
removed
CI/skip-android
Chromium change: https://source.chromium.org/chromium/chromium/src/+/f8ddb215c89b090a11494830f28b6b630167a7a8 commit f8ddb215c89b090a11494830f28b6b630167a7a8 Author: Javier Ernesto Flores Robles <[email protected]> Date: Mon Nov 9 22:09:33 2020 +0000 [iOS][WidgetKit] Enable extension by default in ToT Bug: 1138702
Added a gap between Chromium and our histogram values for ContentSettingsType enum values. This is needed so that we don't have collisions when new values are added to the enum and the array upstream.
This prevents crash on iOS when AUTOPLAY isn't registered (unclear why ATM). Also, removes unneeded header include.
|
CI:
Merging. |
iefremov
reviewed
Jan 7, 2021
|
|
||
| int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting, | ||
| size_t* num_values) { | ||
| DCHECK(static_cast<int>(ContentSettingsType::NUM_TYPES) < kBraveValuesStart); |
There was a problem hiding this comment.
jfyi this could be static_assert
mkarolin
added a commit
that referenced
this pull request
Jan 8, 2021
Upgrade from Chromium 88.0.4315.7 to Chromium 88.0.4324.51.
23 tasks
mkarolin
added a commit
that referenced
this pull request
Jan 12, 2021
Upgrade from Chromium 88.0.4315.7 to Chromium 88.0.4324.51.
mkarolin
added a commit
that referenced
this pull request
Jan 12, 2021
Upgrade from Chromium 88.0.4315.7 to Chromium 88.0.4324.51.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes brave/brave-browser#13103
Related PR: brave/brave-browser#13143
Submitter Checklist:
QA/YesorQA/No;release-notes/includeorrelease-notes/exclude;OS/...) to the associated issuenpm run test -- brave_browser_tests,npm run test -- brave_unit_tests,npm run lint,npm run gn_check,npm run tslintgit rebase master(if needed).Reviewer Checklist:
gnAfter-merge Checklist:
changes has landed on.
Test Plan: