Skip to content

Commit

Permalink
Merge pull request #3896 from brave/revert-c74
Browse files Browse the repository at this point in the history
Revert Chromium 74 from master
  • Loading branch information
bbondy authored Mar 27, 2019
2 parents bd47a7f + 249392c commit 25a0ea7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions lib/l10nUtil.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ 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 @@ -80,6 +82,7 @@ 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": "74.0.3729.22",
"tag": "73.0.3683.75",
"repository": {
"url": "https://chromium.googlesource.com/chromium/src.git"
},
Expand Down

0 comments on commit 25a0ea7

Please sign in to comment.