From c7a5f709d1082c968116f06adcdf16dc7ffcff53 Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Sat, 7 Jun 2025 10:44:47 -0400 Subject: fix mv2 patch --- www-client/chromium/Manifest | 2 +- .../chromium/files/chromium-139-mv2-ungoogled.patch | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) (limited to 'www-client') diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 760634d..ec901cc 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -40,7 +40,7 @@ AUX chromium-138-compiler.patch 17184 BLAKE2B 0b0202513d87aa2883611993afcb23cdc5 AUX chromium-138-gn-exec_script_allowlist.patch 1828 BLAKE2B 9717369b1e89321d06c94757bab5e281b06d8f711f418c33cf68d1d6c2027b2743bd92d1aee97747546030902359766352fa06793b45485b5a1ba30fb7898436 SHA512 dc117e296daa8a02252450078c5aa25cb8dd447a61fe06b2f430708c69f8e429be99ba808f36464e57f8be0b5855be4c83d9e576a9e2d4282fc8bce213787b2d AUX chromium-138-mv2-ungoogled.patch 7303 BLAKE2B 089429a5749d8a3cb071fbe48a35f6a709cf75465a6a3dbd2e72203af71bca8bfc4d3d81b441640089e50d7a0208de579fff32ea937b9cab7e0d6aafc92d57b1 SHA512 1721744dab5827ce9482faceed4eec40a198253e34250d3f3fc994bd287d096450585dd9712f1e4347e591c4873de10d6e6c53c225a2ca21c9c2c47f92820f3f AUX chromium-139-compiler.patch 17165 BLAKE2B b9ffbe4bb34d21819ea0ff3f2447e9e9ea56b93745d6e85e1e924d5fd05b7675bc9ef97be7f37c87049a892a6a82a5ae8daf51aa99332fe3e88fb1265b5f288e SHA512 0ef18d5a6856a96966b44085cf983c5e657533e21940ed830c5bf338908f2d495fab10d0c633c8f1a5017293e0bb5ca1ffcaaa3e6f16a5b5c4eaf849ab9af786 -AUX chromium-139-mv2-ungoogled.patch 7762 BLAKE2B 2d6d2a38f291974a015ffefa4612934e03a1f9254a71c7ead5bdb6bd881279de7d5498f9a5b029d15d8d87f54c5be9df2a6c3fbcd3d04973e3164c1ecb9f5e9d SHA512 0bfc415111cc23ca4bcda9e89181f39c4dba19a6e1a2516ed4e06f18f6fb872a247d65689aad07f0060eb07c621c103036801648ffa09f3741cb2a8624efd0e7 +AUX chromium-139-mv2-ungoogled.patch 7365 BLAKE2B bec1adf79214352df32e2e7dc2ba27b773e840f8d8ef70d79096b3bf5822f5116591dae436bcb8caaf0ea3669004a9638719ec4947a704d536df3b83af05da21 SHA512 857f2ad5b4f0b9ede6018142fbced266fb09065f35f1609e66f6da0e128d40917f242923516c048d9341debdb02ef4acee33181eefcb51e797aa0754f1c94821 AUX chromium-139-protobuf-RepeatedPtrField-export.patch 776 BLAKE2B aa491b162f812832eb03785fa14e969f87fffbaa0d61d04c3a16132f84e407aee49fdcd1e83d8ca944923f6631abdf22c13a5a52353e33f381bf208ee3401934 SHA512 a3e1e70876176ee239f548cf92da9f5bf678d568a50b3cb1e64bce7d1c61be2d3ee6edd0e6189e6cc2a21f59f3b0393280b280fdde5e4c3c0337a2327f6a515a AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca AUX chromium-cross-compile.patch 323 BLAKE2B 8d5091ce5287422c9688ede2563360a96b8bd34b9750dc1c8f0b6ca9aeff2c066fac2da169396baa131d971c087c78f9af53999df0e102d1f57176f5e8d3dd57 SHA512 06d3afc1aa19e57daac0e4bad37e1f365a68408240430e5e818e5a4f12e3b7519214eafa463633e447e7029f4ae13ea864ca347ad1fac117702a0be88718a954 diff --git a/www-client/chromium/files/chromium-139-mv2-ungoogled.patch b/www-client/chromium/files/chromium-139-mv2-ungoogled.patch index 816e9aa..9450773 100644 --- a/www-client/chromium/files/chromium-139-mv2-ungoogled.patch +++ b/www-client/chromium/files/chromium-139-mv2-ungoogled.patch @@ -131,27 +131,18 @@ index 08b7de6995..47ff0885ad 100644 // Returns true if the given `stage` is one in which extension enablement should diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc -index 7a4d1338c4..7a01c8c5f3 100644 +index 7a4d1338c4..9c599a5e7d 100644 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc -@@ -490,16 +490,7 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile, +@@ -490,7 +490,7 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile, extensions_features::kExtensionsMenuAccessControlWithPermittedSites)); source->AddBoolean( "safetyHubThreeDotDetails", - base::FeatureList::IsEnabled(features::kSafetyHubThreeDotDetails)); -- -- // MV2 deprecation. -- auto* mv2_experiment_manager = ManifestV2ExperimentManager::Get(profile); -- MV2ExperimentStage experiment_stage = -- mv2_experiment_manager->GetCurrentExperimentStage(); -- source->AddInteger("MV2ExperimentStage", static_cast(experiment_stage)); -- source->AddBoolean( -- "MV2DeprecationNoticeDismissed", -- mv2_experiment_manager->DidUserAcknowledgeNoticeGlobally()); + false); - #if BUILDFLAG(IS_ANDROID) - source->AddResourcePath("images/product_logo.png", + // MV2 deprecation. + auto* mv2_experiment_manager = ManifestV2ExperimentManager::Get(profile); diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc index f82aaf92ad..48041098a8 100644 --- a/extensions/common/extension.cc -- cgit v1.2.3