Skip to content
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.

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

chore: bump chromium to bd6aad6a4b37dad7aae42fec349e9 (master) #18626

Merged
merged 4 commits into from Jun 5, 2019

Conversation

Projects
None yet
4 participants
@electron-bot
Copy link
Collaborator

commented Jun 4, 2019

Updating Chromium to bd6aad6a4b37dad7aae42fec349e9 (lkgr).

See all changes in 2a7aff41ce73adc0eeee67d364989..bd6aad6a4b37dad7aae42fec349e9

Notes: no-notes

base::scoped_nsobject<NSMenu> main_menu([[NSMenu alloc] initWithTitle:@""]);

using Builder = base::scoped_nsobject<NSMenu> (*)();
static const Builder kBuilderFuncs[] = {&BuildAppMenu};

This comment has been minimized.

Copy link
@nornagon

nornagon Jun 4, 2019

Contributor

Is this copied from somewhere? it seems like overkill

This comment has been minimized.

Copy link
@MarshallOfSound

MarshallOfSound Jun 4, 2019

Member

Yeah @nornagon I deliberately copied the pattern from Chromium so that future changes to anything like this are easily comparable.

@deepak1556
Copy link
Member

left a comment

Should also delete atom/common/resources/mac/MainMenu.xib file

refactor: remove MainMenu.xib as Chromium has removed its dependency …
…on xcode and therefore all xibs

As we set default menus in JS land the default native menu is tiny, just
has a Quit button

Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1627242

@MarshallOfSound MarshallOfSound force-pushed the roller/chromium/master branch from 024f0be to 44ee1f4 Jun 4, 2019

@MarshallOfSound

This comment has been minimized.

Copy link
Member

commented Jun 5, 2019

Linux failures are #18630

Merging in 👍

@MarshallOfSound MarshallOfSound merged commit 164cc43 into master Jun 5, 2019

11 of 13 checks passed

build-linux Workflow: build-linux
Details
Artifact Comparison Changes Detected
Details
Semantic Pull Request ready to be squashed
Details
WIP Ready for review
Details
appveyor: win-ia32-testing AppVeyor build succeeded
Details
appveyor: win-ia32-testing-pr AppVeyor build succeeded
Details
appveyor: win-x64-testing AppVeyor build succeeded
Details
appveyor: win-x64-testing-pr AppVeyor build succeeded
Details
build-mac Workflow: build-mac
Details
electron-arm-testing Build #20190604.83 succeeded
Details
electron-arm64-testing Build #20190604.83 succeeded
Details
lint Workflow: lint
Details
release-notes Release notes found
@release-clerk

This comment has been minimized.

Copy link

commented Jun 5, 2019

No Release Notes

@MarshallOfSound MarshallOfSound deleted the roller/chromium/master branch Jun 5, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.