From 3233bf2cdb5d26dd96181f43e9dce8fe6382feb3 Mon Sep 17 00:00:00 2001 From: Max Karolinskiy Date: Tue, 5 Mar 2019 17:32:22 -0500 Subject: [PATCH 1/2] Upgrade from Chromium 73.0.3683.75 to Chromium 74.0.3729.22 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4b77a72d5a0b..46c3b261caf7 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "73.0.3683.75", + "tag": "74.0.3729.22", "repository": { "url": "https://chromium.googlesource.com/chromium/src.git" }, From 9bd859843e13813722568d0c266590b8262e3aff Mon Sep 17 00:00:00 2001 From: Max Karolinskiy Date: Thu, 14 Mar 2019 16:07:24 -0400 Subject: [PATCH 2/2] Updated l10nUtil: nux_strings.grpd was moved. Moved to onboarding_welcome_strings.grdp. Chromium change: commit 395516be219e7d31767e0ba47a5ac5c9f510c1ff Author: Scott Chen Date: Tue Oct 23 00:05:48 2018 +0000 NUX Onboarding: add some strings Replacing placeholder strings, and move all the add-string calls to under one function. also fixes a path bug for apps/ -> google_apps/ introduced in https://chromium-review.googlesource.com/c/chromium/src/+/1285210 Bug: 874122 --- lib/l10nUtil.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/l10nUtil.js b/lib/l10nUtil.js index 730af21974d4..af6d33559dcf 100644 --- 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