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 from Chromium 70.0.3538.77 Chromium 71.0.3578.20 #1898

Merged
merged 1 commit into from
Oct 30, 2018
Merged

Upgrade from Chromium 70.0.3538.77 Chromium 71.0.3578.20 #1898

merged 1 commit into from
Oct 30, 2018

Conversation

bbondy
Copy link
Member

@bbondy bbondy commented Oct 30, 2018

Fix #1753

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:

Reviewer Checklist:

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

@bbondy bbondy self-assigned this Oct 30, 2018
bbondy
bbondy commented Oct 30, 2018
View reviewed changes
lib/l10nUtil.js
const chromiumFileManagerStringsPartPath = path.resolve(path.join(srcDir, 'chrome', 'app', 'file_manager_strings.grdp'))
const braveFileManagerStringsPartPath = path.resolve(path.join(srcDir, 'brave', 'app', 'file_manager_strings.grdp'))
const chromiumNuxStringsPartPath = path.resolve(path.join(srcDir, 'chrome', 'app', 'nux_strings.grdp'))
const braveNuxStringsPartPath = path.resolve(path.join(srcDir, 'brave', 'app', 'nux_strings.grdp'))
Copy link
Member Author

Choose a reason for hiding this comment

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

These need to be included since grdp files are newly added to the parent grd file which we process.

emerick
emerick approved these changes Oct 30, 2018
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

darkdh
darkdh approved these changes Oct 30, 2018
View reviewed changes
Copy link
Member

@darkdh darkdh left a comment

Choose a reason for hiding this comment

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

++

@bbondy bbondy merged commit 5b2614e into master Oct 30, 2018
@bbondy
Copy link
Member Author

bbondy commented Oct 30, 2018 •
edited
Loading

master: 5b2614e
0.57.x: ce5a6c2

bbondy added a commit that referenced this pull request Oct 30, 2018
@bbondy
Merge pull request #1898 from brave/71.0.3578.20
ce5a6c2 
Upgrade from Chromium 70.0.3538.77 Chromium 71.0.3578.20
@bbondy bbondy removed the 0.57.x label Jan 14, 2019
@mihaiplesa mihaiplesa deleted the 71.0.3578.20 branch February 9, 2019 12:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emerick emerick emerick approved these changes

@darkdh darkdh darkdh approved these changes

@bridiver bridiver Awaiting requested review from bridiver

@petemill petemill Awaiting requested review from petemill

Assignees

@bbondy bbondy

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

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