Merge pull request #3931 from brave/74.0.3729.40

Upgrade from Chromium 73.0.3683.75 to Chromium 74.0.3729.40
brave · Apr 3, 2019 · 298d312 · 298d312
1 parent ffe1486
commit 298d312
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/lib/l10nUtil.js b/lib/l10nUtil.js
@@ -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'))
@@ -82,7 +80,6 @@ const chromiumToAutoGeneratedBraveMapping = {
   [chromiumPrintingStringsPartPath]: bravePrintingStringsPartPath,
   [chromiumProfileSettingsPartPath]: braveProfileSettingsPartPath,
   [chromiumFileManagerStringsPartPath]: braveFileManagerStringsPartPath,
-  [chromiumNuxStringsPartPath]: braveNuxStringsPartPath,
   [chromiumVRStringsPartPath]: braveVRStringsPartPath,
   [chromiumOnboardingWelcomeStringsPartPath]: braveOnboardingWelcomeStringsPartPath,
   [chromiumAppManagementStringsPartPath]: braveAppManagementStringsPartPath

diff --git a/package.json b/package.json
@@ -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"
         },

diff --git a/scripts/sync.js b/scripts/sync.js
@@ -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()
 }