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

WIP: Upgrade Chromium from 73.0.3683.75 to Chromium 74.0.3729.6 #3768

Closed
wants to merge 3 commits into from
Closed

WIP: Upgrade Chromium from 73.0.3683.75 to Chromium 74.0.3729.6 #3768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
781894b
Upgrade from Chromium 73.0.3683.75 to Chromium 74.0.3729.6
mkarolin Mar 5, 2019
4a60cb0
Updated l10nUtil: nux_strings.grpd was moved.
mkarolin Mar 14, 2019
98c1be0
Temporary set brave-core to 74.0.3729.6 branch
mkarolin Mar 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions lib/l10nUtil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ const chromiumProfileSettingsPartPath = path.resolve(path.join(srcDir, 'chrome',
const braveProfileSettingsPartPath = path.resolve(path.join(srcDir, 'brave', 'app', 'profiles_strings.grdp'))
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'))
const chromiumVRStringsPartPath = path.resolve(path.join(srcDir, 'chrome', 'app', 'vr_strings.grdp'))
const braveVRStringsPartPath = path.resolve(path.join(srcDir, 'brave', 'app', 'vr_strings.grdp'))
const chromiumOnboardingWelcomeStringsPartPath = path.resolve(path.join(srcDir, 'chrome', 'app', 'onboarding_welcome_strings.grdp'))
Expand Down Expand Up @@ -82,7 +80,6 @@ const chromiumToAutoGeneratedBraveMapping = {
[chromiumPrintingStringsPartPath]: bravePrintingStringsPartPath,
[chromiumProfileSettingsPartPath]: braveProfileSettingsPartPath,
[chromiumFileManagerStringsPartPath]: braveFileManagerStringsPartPath,
[chromiumNuxStringsPartPath]: braveNuxStringsPartPath,
[chromiumVRStringsPartPath]: braveVRStringsPartPath,
[chromiumOnboardingWelcomeStringsPartPath]: braveOnboardingWelcomeStringsPartPath,
[chromiumAppManagementStringsPartPath]: braveAppManagementStringsPartPath
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "73.0.3683.75",
"tag": "74.0.3729.6",
"repository": {
"url": "https://chromium.googlesource.com/chromium/src.git"
},
Expand All @@ -42,7 +42,7 @@
},
"brave-core": {
"dir": "src/brave",
"branch": "master",
"branch": "74.0.3729.6",
"repository": {
"url": "https://github.com/brave/brave-core.git"
}
Expand Down