Skip to content

Commit

Permalink
Merge pull request #3931 from brave/74.0.3729.40
Browse files Browse the repository at this point in the history
Upgrade from Chromium 73.0.3683.75 to Chromium 74.0.3729.40
  • Loading branch information
bsclifton authored and mkarolin committed Apr 3, 2019
1 parent ffe1486 commit 298d312
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
3 changes: 0 additions & 3 deletions lib/l10nUtil.js
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
2 changes: 1 addition & 1 deletion package.json
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.40",
"repository": {
"url": "https://chromium.googlesource.com/chromium/src.git"
},
Expand Down
2 changes: 2 additions & 0 deletions scripts/sync.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,7 @@ if (updatedVersion || program.init || program.run_sync) {
}

if (updatedVersion || program.init || program.run_hooks) {
const core_dir = config.projects['brave-core'].dir
util.run('python', [path.join(core_dir, 'script', 'apply-patches.py')])
util.gclientRunhooks()
}

0 comments on commit 298d312

Please sign in to comment.