Date: Wed, 30 Aug 2023 10:27:51 GMT From: Robert Nagy <rnagy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f80e0e6a5faa - main - www/chromium: update to 116.0.5845.140 Message-ID: <202308301027.37UARpln048130@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f80e0e6a5faa2227af95330f61609a16bf1ac040 commit f80e0e6a5faa2227af95330f61609a16bf1ac040 Author: Robert Nagy <rnagy@FreeBSD.org> AuthorDate: 2023-08-30 10:26:47 +0000 Commit: Robert Nagy <rnagy@FreeBSD.org> CommitDate: 2023-08-30 10:27:34 +0000 www/chromium: update to 116.0.5845.140 Security: https://vuxml.freebsd.org/freebsd/22fffa69-46fa-11ee-8290-a8a1599412c6.html --- www/chromium/Makefile | 3 +-- www/chromium/distinfo | 14 +++++++------- .../patch-chrome_app_generated__resources.grd | 12 ++++++------ .../files/patch-chrome_browser_about__flags.cc | 18 +++++++++--------- .../patch-chrome_browser_flag__descriptions.cc | 22 +++++++++++----------- .../patch-chrome_browser_flag__descriptions.h | 20 ++++++++++---------- ...chrome__browser__main__extra__parts__metrics.cc | 12 ++++++------ ..._chrome__browser__main__extra__parts__metrics.h | 6 +++--- www/chromium/files/patch-chrome_test_BUILD.gn | 4 ++-- 9 files changed, 55 insertions(+), 56 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index b70c1bb9bc24..e7faff04349b 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,6 +1,5 @@ PORTNAME= chromium -PORTVERSION= 116.0.5845.110 -PORTREVISION= 1 +PORTVERSION= 116.0.5845.140 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:external diff --git a/www/chromium/distinfo b/www/chromium/distinfo index c47c74c7e606..c62e31beb6d2 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1692873434 -SHA256 (chromium-116.0.5845.110.tar.xz) = e85ef479a1a4972ffd4d2e389cbaf341df4c7cca63e4ebbb38d175fda106d9a9 -SIZE (chromium-116.0.5845.110.tar.xz) = 1599776928 -SHA256 (chrome-linux-116.0.5845.110-llvm13.profdata.tar.xz) = 6733879d92df843e2fdf3a8aaf221a785c5e5f73d8625a6b9b8c3376357f12d1 -SIZE (chrome-linux-116.0.5845.110-llvm13.profdata.tar.xz) = 27740936 -SHA256 (chromium-116.0.5845.110-testdata.tar.xz) = 784577faa337801c8111bb5459f72a65043053f68bec037ab1920828c6534dc3 -SIZE (chromium-116.0.5845.110-testdata.tar.xz) = 267917840 +TIMESTAMP = 1693375433 +SHA256 (chromium-116.0.5845.140.tar.xz) = f89677b9da05baa569fd143a3456cb5cbce8bde9ea7d10b4f3907dcd1132716c +SIZE (chromium-116.0.5845.140.tar.xz) = 1599642528 +SHA256 (chrome-linux-116.0.5845.140-llvm13.profdata.tar.xz) = b56ca33278b00d38befed7e6bdb0c223a8c783a27f6e6feeb71a7ae75a1c60df +SIZE (chrome-linux-116.0.5845.140-llvm13.profdata.tar.xz) = 27739728 +SHA256 (chromium-116.0.5845.140-testdata.tar.xz) = 517e0fb137261ded43c1973d8d6cc35a37aa491d715efc3ab74340847269ac45 +SIZE (chromium-116.0.5845.140-testdata.tar.xz) = 267843724 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734 diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd index e9d1c4df2859..bcf01181fdbf 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/generated_resources.grd.orig 2023-08-17 07:33:31 UTC +--- chrome/app/generated_resources.grd.orig 2023-08-30 06:01:45 UTC +++ chrome/app/generated_resources.grd @@ -2,7 +2,7 @@ @@ -45,7 +45,7 @@ <message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch."> Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available. </message> -@@ -9884,7 +9884,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -9902,7 +9902,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW <message name="IDS_APP_MENU_BUTTON_UPDATE" desc="Short label next to app-menu button when an update is available."> Update </message> @@ -54,7 +54,7 @@ <message name="IDS_APP_MENU_BUTTON_UPDATE_ALT1" desc="Alternate short label next to app-menu button when an update is available."> Finish update </message> -@@ -10220,7 +10220,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -10238,7 +10238,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW Google Pay </message> @@ -63,7 +63,7 @@ <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders."> Use system title bar and borders </message> -@@ -11193,7 +11193,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -11211,7 +11211,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW </message> <!-- Device Trust Consent dialog --> @@ -72,7 +72,7 @@ <message name="IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE" desc="Title of the dialog shown when user consent is required to share device signals."> Share device signals? </message> -@@ -11592,7 +11592,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -11610,7 +11610,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> @@ -81,7 +81,7 @@ <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window."> Minimize </message> -@@ -13784,7 +13784,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -13802,7 +13802,7 @@ Please help our engineers fix this problem. Tell us wh Open Anyway </message> diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index 0bd535a581db..b9209608f6ea 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,4 +1,4 @@ ---- chrome/browser/about_flags.cc.orig 2023-08-17 07:33:31 UTC +--- chrome/browser/about_flags.cc.orig 2023-08-30 06:01:45 UTC +++ chrome/browser/about_flags.cc @@ -223,7 +223,7 @@ #include "ui/ui_features.h" @@ -70,7 +70,7 @@ {"omnibox-domain-suggestions", flag_descriptions::kOmniboxDomainSuggestionsName, flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, -@@ -6678,7 +6678,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6682,7 +6682,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kParallelDownloadingDescription, kOsAll, FEATURE_VALUE_TYPE(download::features::kParallelDownloading)}, @@ -79,7 +79,7 @@ {"enable-async-dns", flag_descriptions::kAsyncDnsName, flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, FEATURE_VALUE_TYPE(features::kAsyncDns)}, -@@ -8368,7 +8368,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8372,7 +8372,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -88,7 +88,7 @@ {"quick-commands", flag_descriptions::kQuickCommandsName, flag_descriptions::kQuickCommandsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kQuickCommands)}, -@@ -8629,7 +8629,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8633,7 +8633,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -97,7 +97,7 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -8690,7 +8690,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8694,7 +8694,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -106,7 +106,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9258,7 +9258,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9262,7 +9262,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -115,7 +115,7 @@ {"document-picture-in-picture-api", flag_descriptions::kDocumentPictureInPictureApiName, flag_descriptions::kDocumentPictureInPictureApiDescription, -@@ -9978,7 +9978,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9982,7 +9982,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebUIOmniboxPopupDescription, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopup)}, @@ -124,7 +124,7 @@ {"webui-system-font", flag_descriptions::kWebUiSystemFontName, flag_descriptions::kWebUiSystemFontDescription, kOsAll, FEATURE_VALUE_TYPE(features::kWebUiSystemFont)}, -@@ -10163,7 +10163,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10167,7 +10167,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ @@ -133,7 +133,7 @@ {"data-retention-policies-disable-sync-types-needed", flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededName, flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededDescription, -@@ -10571,7 +10571,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10575,7 +10575,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index 486e2aa80cb1..7cf5f95e7595 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2023-08-17 07:33:31 UTC +--- chrome/browser/flag_descriptions.cc.orig 2023-08-30 06:01:45 UTC +++ chrome/browser/flag_descriptions.cc -@@ -2512,7 +2512,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P +@@ -2515,7 +2515,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P const char kWebUIOmniboxPopupDescription[] = "If enabled, shows the omnibox suggestions popup in WebUI."; @@ -9,7 +9,7 @@ const char kWebUiSystemFontName[] = "WebUI System font"; const char kWebUiSystemFontDescription[] = "If enabled, all WebUI surfaces will use the default UI font of the " -@@ -6832,7 +6832,7 @@ const char kLibAssistantV2MigrationDescription[] = +@@ -6835,7 +6835,7 @@ const char kLibAssistantV2MigrationDescription[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -18,7 +18,7 @@ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -7072,7 +7072,7 @@ const char kSearchWebInSidePanelDescription[] = +@@ -7075,7 +7075,7 @@ const char kSearchWebInSidePanelDescription[] = // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ const char kQuickCommandsName[] = "Quick Commands"; const char kQuickCommandsDescription[] = "Enable a text interface to browser features. Invoke with Ctrl-Space."; -@@ -7081,7 +7081,7 @@ const char kQuickCommandsDescription[] = +@@ -7084,7 +7084,7 @@ const char kQuickCommandsDescription[] = // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -7103,7 +7103,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] +@@ -7106,7 +7106,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] "instead of JSON."; #endif @@ -45,7 +45,7 @@ const char kUseOutOfProcessVideoDecodingName[] = "Use out-of-process video decoding (OOP-VD)"; const char kUseOutOfProcessVideoDecodingDescription[] = -@@ -7121,7 +7121,7 @@ const char kWebShareDescription[] = +@@ -7124,7 +7124,7 @@ const char kWebShareDescription[] = "platforms."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -54,7 +54,7 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -7141,7 +7141,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -7144,7 +7144,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -63,7 +63,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -7155,7 +7155,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail +@@ -7158,7 +7158,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail "storage and requests initial sync."; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -72,7 +72,7 @@ const char kAsyncDnsName[] = "Async DNS resolver"; const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -@@ -7256,7 +7256,7 @@ const char kElasticOverscrollDescription[] = +@@ -7259,7 +7259,7 @@ const char kElasticOverscrollDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -81,7 +81,7 @@ const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -7285,7 +7285,7 @@ const char kSigninInterceptBubbleV2Description[] = +@@ -7288,7 +7288,7 @@ const char kSigninInterceptBubbleV2Description[] = #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 900f57ca5e2c..0ac77bf677f0 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.h.orig 2023-08-17 07:33:31 UTC +--- chrome/browser/flag_descriptions.h.orig 2023-08-30 06:01:45 UTC +++ chrome/browser/flag_descriptions.h -@@ -1412,7 +1412,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd +@@ -1415,7 +1415,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd extern const char kWebUIOmniboxPopupName[]; extern const char kWebUIOmniboxPopupDescription[]; @@ -9,7 +9,7 @@ extern const char kWebUiSystemFontName[]; extern const char kWebUiSystemFontDescription[]; #endif -@@ -3928,7 +3928,7 @@ extern const char kLacrosMergeIcuDataFileName[]; +@@ -3931,7 +3931,7 @@ extern const char kLacrosMergeIcuDataFileName[]; extern const char kLacrosMergeIcuDataFileDescription[]; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -18,7 +18,7 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4058,14 +4058,14 @@ extern const char kSearchWebInSidePanelDescription[]; +@@ -4061,14 +4061,14 @@ extern const char kSearchWebInSidePanelDescription[]; // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -35,7 +35,7 @@ extern const char kWebShareName[]; extern const char kWebShareDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -4075,7 +4075,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4078,7 +4078,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -44,7 +44,7 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4085,7 +4085,7 @@ extern const char kOzonePlatformHintName[]; +@@ -4088,7 +4088,7 @@ extern const char kOzonePlatformHintName[]; extern const char kOzonePlatformHintDescription[]; #endif // BUILDFLAG(IS_LINUX) @@ -53,7 +53,7 @@ extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -4093,13 +4093,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt +@@ -4096,13 +4096,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -69,7 +69,7 @@ extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -4115,7 +4115,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; +@@ -4118,7 +4118,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; extern const char kEnableProtoApiForClassifyUrlDescription[]; #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) @@ -78,7 +78,7 @@ extern const char kUseOutOfProcessVideoDecodingName[]; extern const char kUseOutOfProcessVideoDecodingDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -4189,7 +4189,7 @@ extern const char kElasticOverscrollDescription[]; +@@ -4192,7 +4192,7 @@ extern const char kElasticOverscrollDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -87,7 +87,7 @@ extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; -@@ -4207,7 +4207,7 @@ extern const char kSigninInterceptBubbleV2Description[ +@@ -4210,7 +4210,7 @@ extern const char kSigninInterceptBubbleV2Description[ #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index e2a4e290b2e0..2d60da125925 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-08-17 07:33:31 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-08-30 06:01:45 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -77,8 +77,10 @@ +@@ -78,8 +78,10 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -12,7 +12,7 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" -@@ -107,7 +109,7 @@ +@@ -108,7 +110,7 @@ #include "chromeos/crosapi/cpp/crosapi_constants.h" #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -21,7 +21,7 @@ #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h" #endif // BUILDFLAG(IS_LINUX) -@@ -116,7 +118,7 @@ +@@ -117,7 +119,7 @@ #include "components/user_manager/user_manager.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -30,7 +30,7 @@ #include "components/power_metrics/system_power_monitor.h" #endif -@@ -538,7 +540,7 @@ void RecordStartupMetrics() { +@@ -539,7 +541,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. @@ -39,7 +39,7 @@ shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -812,11 +814,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt +@@ -860,11 +862,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt } #endif // !BUILDFLAG(IS_ANDROID) diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h index 68b4480006d3..c4f23791c7b8 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2023-08-30 06:01:45 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h -@@ -32,7 +32,7 @@ class PowerMetricsReporter; +@@ -33,7 +33,7 @@ class PowerMetricsReporter; class ProcessMonitor; #endif @@ -9,7 +9,7 @@ class PressureMetricsReporter; #endif // BUILDFLAG(IS_LINUX) -@@ -133,7 +133,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro +@@ -139,7 +139,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro std::unique_ptr<BatteryDischargeReporter> battery_discharge_reporter_; #endif // !BUILDFLAG(IS_ANDROID) diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index 2debd65cb639..0dbeb8d9c746 100644 --- a/www/chromium/files/patch-chrome_test_BUILD.gn +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2023-08-17 07:33:31 UTC +--- chrome/test/BUILD.gn.orig 2023-08-30 06:01:45 UTC +++ chrome/test/BUILD.gn -@@ -10600,7 +10600,7 @@ test("chrome_app_unittests") { +@@ -10601,7 +10601,7 @@ test("chrome_app_unittests") { "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", ]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308301027.37UARpln048130>