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.

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

Jump to bottom

Upgrade Chromium from 73.0.3683.75 to Chromium 74.0.3729.22 #3790

Merged
merged 2 commits into from
Mar 21, 2019
Merged

Upgrade Chromium from 73.0.3683.75 to Chromium 74.0.3729.22 #3790

merged 2 commits into from
Mar 21, 2019

Conversation

mkarolin
Copy link
Contributor

@mkarolin mkarolin commented Mar 19, 2019 •
edited
Loading

Fix #3502
Related PR: brave/brave-core#2013

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Requested a security/privacy review as needed.

Test Plan:

See #3502.

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions.

@mkarolin mkarolin added this to the 0.64.x - Nightly milestone Mar 19, 2019
@mkarolin mkarolin self-assigned this Mar 19, 2019
This was referenced Mar 19, 2019
Closed
Merged
@mkarolin
Upgrade from Chromium 73.0.3683.75 to Chromium 74.0.3729.22
3233bf2
@mkarolin
Updated l10nUtil: nux_strings.grpd was moved.
9bd8598 
Moved to onboarding_welcome_strings.grdp.

Chromium change:

commit 395516be219e7d31767e0ba47a5ac5c9f510c1ff
Author: Scott Chen <scottchen@chromium.org>
Date:   Tue Oct 23 00:05:48 2018 +0000

    NUX Onboarding: add some strings

    Replacing placeholder strings, and move all the add-string calls to under
    one function.

    also fixes a path bug for apps/ -> google_apps/ introduced in
    https://chromium-review.googlesource.com/c/chromium/src/+/1285210

    Bug: 874122
@mkarolin mkarolin marked this pull request as ready for review March 20, 2019 20:53
emerick
emerick approved these changes Mar 20, 2019
View reviewed changes
Copy link
Contributor

@emerick emerick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mkarolin mkarolin changed the title WIP: Upgrade Chromium from 73.0.3683.75 to Chromium 74.0.3729.22 Upgrade Chromium from 73.0.3683.75 to Chromium 74.0.3729.22 Mar 20, 2019
@mkarolin mkarolin merged commit b4137ce into master Mar 21, 2019
@mkarolin mkarolin deleted the 74.0.3729.22 branch March 21, 2019 14:23
mkarolin added a commit that referenced this pull request Mar 21, 2019
@mkarolin
Merge pull request #3790 from brave/74.0.3729.22
faa75ac 
Upgrade Chromium from 73.0.3683.75 to Chromium 74.0.3729.22
@mkarolin mkarolin mentioned this pull request Mar 21, 2019
Closed
brave-builds pushed a commit that referenced this pull request Mar 21, 2019
@mkarolin @brave-browser-releases
Merge pull request #3790 from brave/74.0.3729.22
bd116c0 
Upgrade Chromium from 73.0.3683.75 to Chromium 74.0.3729.22
bsclifton added a commit that referenced this pull request Mar 26, 2019
@bsclifton
Revert "Merge pull request #3790 from brave/74.0.3729.22"
0540b19 
This reverts commit b4137ce, reversing
changes made to 01cc26a.
@bsclifton bsclifton mentioned this pull request Mar 26, 2019
Closed
19 tasks
bsclifton added a commit that referenced this pull request Mar 26, 2019
@bsclifton
Revert Chromium 74
dd9d771 
(originally implemented with #3790)

Fixes #3898
@bsclifton bsclifton mentioned this pull request Mar 26, 2019
Merged
16 tasks
@jumde jumde mentioned this pull request Mar 27, 2019
Merged
19 tasks
petemill pushed a commit to brave/brave-core that referenced this pull request Jul 27, 2020
@bsclifton
Revert Chromium 74
72d2e78 
(originally implemented with brave/brave-browser#3790)

Fixes brave/brave-browser#3898
petemill pushed a commit to brave/brave-core that referenced this pull request Jul 28, 2020
@bsclifton
Revert Chromium 74
c697a4d 
(originally implemented with brave/brave-browser#3790)

Fixes brave/brave-browser#3898
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bbondy bbondy bbondy approved these changes

@emerick emerick emerick approved these changes

@bsclifton bsclifton Awaiting requested review from bsclifton

Assignees

@mkarolin mkarolin

Labels
None yet
Projects
None yet
Milestone
0.64.x - Release (Release Channel)
Development

Successfully merging this pull request may close these issues.
3 participants
@mkarolin @bbondy @emerick