Upgrade from Chromium 85 to Chromium 86. #6195
Merged
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
mariospr
force-pushed
the
cr86
branch
5 times, most recently
from
032a186 to
20f77b1
Compare
mariospr
force-pushed
the
cr86
branch
3 times, most recently
from
12e7c5a to
166e4af
Compare
mkarolin
force-pushed
the
cr86
branch
2 times, most recently
from
e267ddf to
2b73327
Compare
mkarolin
requested review from
bridiver,
iefremov,
NejcZdovc,
simonhong and
tmancey
as code owners
29 tasks
| @@ -91,7 +91,7 @@ - (instancetype)initWithConfiguration:(BATBraveRewardsConfiguration *)configurat | |||
| adsClass:(nullable Class)adsClass | |||
| { | |||
| if ((self = [super init])) { | |||
| if (!base::MessageLoopCurrent::Get()) { | |||
| if (!base::CurrentThread::Get()) { | |||
There was a problem hiding this comment.
cc @Brandon-T Sync will have these changes in c86 instead as you moved this
There was a problem hiding this comment.
@kylehickinson I'll take care of it, it will cause a build error anyway
The welcome page was not loading due to the following JS error:
Uncaught ReferenceError: PromiseResolver is not defined
at Object.sendWithPromise (cr.js:344)
at welcomeUtils.ts:16
at Object.dispatch (index.js:8)
at Object.getSearchEngineProviders (redux.js:462)
at loadWelcomeData (brave_welcome.tsx:26)
at HTMLDocument.initialize (brave_welcome.tsx:31)
As it was also done already for brave_new_tab.html (search for
the "Fixes NTP" commit), we fix this error by doing this:
- Removed import of cr.html as import has been deprecated
- Added sourcing of promise_resolver.js to brave_welcome.html
via chromium_src override of //extensions/common/constants.h/cc
Update shields default cookies setting accordingly.
Chromium change: https://chromium.googlesource.com/chromium/src/+/4dbedadecc16a6769451f30751ee52f259874a21 commit 4dbedadecc16a6769451f30751ee52f259874a21 Author: Patrick Noland <[email protected]> Date: Mon Aug 10 18:29:41 2020 +0000 [ToolbarMVC] Create menu_button package and MenuButtonCoordinator This starts the process of hiding the MenuButton view behind the coordinator. Primarily, ToolbarAppMenuM nager (renamed to MenuButtonCoordinator) now directly manipulates the MenuButton instead of doing so through TopToolbarCoordinator. MenuButton related functionality is removed from the Toolbar interface, with a few me hanical adjustments to match. Bug: 1086676
- Moved a dep under extensions guard - Removed unused headers includes.
Original code had both OS_MACOSX and OS_IOS, which were incorrectly replaced with just OS_MAC. Adjusted to use OS_APPLE so that both platforms are covered again.
mkarolin
removed
CI/skip-android
tmancey
requested changes
Sep 11, 2020
| @@ -34,7 +34,7 @@ LocaleHelper* LocaleHelper::GetInstance() { | |||
| return GetInstanceImpl(); | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
This change should not include iOS, thanks
There was a problem hiding this comment.
@tmancey the original code (current master) has both OS_MACOSX and OS_IOS, see
https://github.com/brave/brave-core/blob/master/components/l10n/browser/locale_helper.cc#L37
If I don't have IOS in there, I get a compilation error when building for iOS in Debug about a duplicate symbol GetInstanceImp defined in locale_helper.o and locale_helper_ios.o.
There was a problem hiding this comment.
Ah yes apologies as was checking in my mobile and missed that. Thanks
|
When uplifting, also uplift fixes for:
|
32 tasks
mkarolin
added a commit
that referenced
this pull request
Sep 21, 2020
Upgrade from Chromium 85 to Chromium 86.
32 tasks
Merged
33 tasks
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#10884
Related PR: brave/brave-browser#10886
Submitter Checklist:
npm run lint)git rebase master(if needed).git rebase -ito squash commits (if needed).Test Plan:
Reviewer Checklist:
After-merge Checklist:
changes has landed on.