diff options
Diffstat (limited to 'www-client/chromium/files/chromium-137-mv2-ungoogled-r1.patch')
| -rw-r--r-- | www-client/chromium/files/chromium-137-mv2-ungoogled-r1.patch | 183 |
1 files changed, 0 insertions, 183 deletions
diff --git a/www-client/chromium/files/chromium-137-mv2-ungoogled-r1.patch b/www-client/chromium/files/chromium-137-mv2-ungoogled-r1.patch deleted file mode 100644 index b813cce..0000000 --- a/www-client/chromium/files/chromium-137-mv2-ungoogled-r1.patch +++ /dev/null @@ -1,183 +0,0 @@ -diff --git a/chrome/browser/extensions/api/developer_private/extension_info_generator_desktop.cc b/chrome/browser/extensions/api/developer_private/extension_info_generator_desktop.cc -index f1fa171180..73069f1456 100644 ---- a/chrome/browser/extensions/api/developer_private/extension_info_generator_desktop.cc -+++ b/chrome/browser/extensions/api/developer_private/extension_info_generator_desktop.cc -@@ -131,17 +131,6 @@ void ExtensionInfoGenerator::FillExtensionInfo( - info.controlled_info.emplace(); - info.controlled_info->text = - l10n_util::GetStringUTF8(IDS_EXTENSIONS_INSTALL_LOCATION_ENTERPRISE); -- } else { -- // Create Safety Hub information for any non-enterprise extension. -- developer::SafetyCheckWarningReason warning_reason = -- ExtensionSafetyCheckUtils::GetSafetyCheckWarningReason(extension, -- profile); -- if (warning_reason != developer::SafetyCheckWarningReason::kNone) { -- info.safety_check_warning_reason = warning_reason; -- info.safety_check_text = -- ExtensionSafetyCheckUtils::GetSafetyCheckWarningStrings( -- warning_reason, state); -- } - } - - bool is_enabled = state == developer::ExtensionState::kEnabled; -diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc -index ae782891ad..b0b82002e2 100644 ---- a/chrome/browser/extensions/extension_management.cc -+++ b/chrome/browser/extensions/extension_management.cc -@@ -322,31 +322,7 @@ bool ExtensionManagement::IsAllowedManifestVersion( - int manifest_version, - const std::string& extension_id, - Manifest::Type manifest_type) { -- bool enabled_by_default = -- !base::FeatureList::IsEnabled( -- extensions_features::kExtensionsManifestV3Only) || -- manifest_version >= 3; -- -- // Manifest version policy only supports normal extensions and Chrome OS login -- // screen extension. -- if (manifest_type != Manifest::Type::TYPE_EXTENSION && -- manifest_type != Manifest::Type::TYPE_LOGIN_SCREEN_EXTENSION) { -- return enabled_by_default; -- } -- switch (global_settings_->manifest_v2_setting) { -- case internal::GlobalSettings::ManifestV2Setting::kDefault: -- return enabled_by_default; -- case internal::GlobalSettings::ManifestV2Setting::kDisabled: -- return manifest_version >= 3; -- case internal::GlobalSettings::ManifestV2Setting::kEnabled: - return true; -- case internal::GlobalSettings::ManifestV2Setting::kEnabledForForceInstalled: -- auto installation_mode = -- GetInstallationMode(extension_id, /*update_url=*/std::string()); -- return manifest_version >= 3 || -- installation_mode == ManagedInstallationMode::kForced || -- installation_mode == ManagedInstallationMode::kRecommended; -- } - } - - bool ExtensionManagement::IsAllowedManifestVersion(const Extension* extension) { -@@ -367,26 +343,8 @@ bool ExtensionManagement::IsExemptFromMV2DeprecationByPolicy( - return false; - } - -- switch (global_settings_->manifest_v2_setting) { -- case internal::GlobalSettings::ManifestV2Setting::kDefault: -- // Default browser behavior. Not exempt. -- return false; -- case internal::GlobalSettings::ManifestV2Setting::kDisabled: -- // All MV2 extensions are disallowed. Not exempt. -- return false; -- case internal::GlobalSettings::ManifestV2Setting::kEnabled: - // All MV2 extensions are allowed. Exempt. - return true; -- case internal::GlobalSettings::ManifestV2Setting::kEnabledForForceInstalled: -- // Force-installed MV2 extensions are allowed. Exempt if it's a force- -- // installed extension only. -- auto installation_mode = -- GetInstallationMode(extension_id, /*update_url=*/std::string()); -- return installation_mode == ManagedInstallationMode::kForced || -- installation_mode == ManagedInstallationMode::kRecommended; -- } -- -- return false; - } - - bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy( -diff --git a/chrome/browser/extensions/keyed_services/chrome_browser_context_keyed_service_factories.cc b/chrome/browser/extensions/keyed_services/chrome_browser_context_keyed_service_factories.cc -index 7e3da1ed93..070ee94638 100644 ---- a/chrome/browser/extensions/keyed_services/chrome_browser_context_keyed_service_factories.cc -+++ b/chrome/browser/extensions/keyed_services/chrome_browser_context_keyed_service_factories.cc -@@ -38,7 +38,6 @@ - #include "chrome/browser/extensions/extension_gcm_app_handler.h" - #include "chrome/browser/extensions/extension_sync_service_factory.h" - #include "chrome/browser/extensions/extension_web_ui_override_registrar.h" --#include "chrome/browser/extensions/manifest_v2_experiment_manager.h" - #include "chrome/browser/extensions/menu_manager_factory.h" - #include "chrome/browser/extensions/permissions/permissions_updater.h" - #include "chrome/browser/extensions/plugin_manager.h" -@@ -87,7 +86,6 @@ void EnsureChromeBrowserContextKeyedServiceFactoriesBuilt() { - extensions::ExtensionGarbageCollectorFactory::GetInstance(); - extensions::ExtensionGCMAppHandler::GetFactoryInstance(); - extensions::ChromeExtensionSystemFactory::GetInstance(); -- extensions::ManifestV2ExperimentManager::GetFactory(); - extensions::MenuManagerFactory::GetInstance(); - #if BUILDFLAG(ENABLE_PLUGINS) - extensions::PluginManager::GetFactoryInstance(); -diff --git a/chrome/browser/extensions/manifest_v2_experiment_manager.cc b/chrome/browser/extensions/manifest_v2_experiment_manager.cc -index 13f7aab619..1426198b8d 100644 ---- a/chrome/browser/extensions/manifest_v2_experiment_manager.cc -+++ b/chrome/browser/extensions/manifest_v2_experiment_manager.cc -@@ -146,22 +146,6 @@ bool ManifestV2ExperimentManagerFactory::ServiceIsCreatedWithBrowserContext() - - // Determines the current stage of the MV2 deprecation experiments. - MV2ExperimentStage CalculateCurrentExperimentStage() { -- // Return the "highest" stage that is currently active for the user. -- if (base::FeatureList::IsEnabled( -- extensions_features::kExtensionManifestV2Unsupported)) { -- return MV2ExperimentStage::kUnsupported; -- } -- -- if (base::FeatureList::IsEnabled( -- extensions_features::kExtensionManifestV2Disabled)) { -- return MV2ExperimentStage::kDisableWithReEnable; -- } -- -- if (base::FeatureList::IsEnabled( -- extensions_features::kExtensionManifestV2DeprecationWarning)) { -- return MV2ExperimentStage::kWarning; -- } -- - return MV2ExperimentStage::kNone; - } - -@@ -201,19 +185,7 @@ PrefMap GetGlobalNoticeAcknowledgedPrefFor( - // Returns true if legacy extensions should be disabled, looking at both - // experiment stage and global state. - bool ShouldDisableLegacyExtensions(MV2ExperimentStage stage) { -- if (g_allow_mv2_for_testing) { -- // We allow legacy MV2 extensions for testing purposes. -- return false; -- } -- -- switch (stage) { -- case MV2ExperimentStage::kNone: -- case MV2ExperimentStage::kWarning: - return false; -- case MV2ExperimentStage::kDisableWithReEnable: -- case MV2ExperimentStage::kUnsupported: -- return true; -- } - } - - // 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 f769bdb059..f01ffd22ec 100644 ---- a/chrome/browser/ui/webui/extensions/extensions_ui.cc -+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc -@@ -490,7 +490,7 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile, - extensions_features::kExtensionsMenuAccessControlWithPermittedSites)); - source->AddBoolean( - "safetyHubThreeDotDetails", -- base::FeatureList::IsEnabled(features::kSafetyHubThreeDotDetails)); -+ false); - - #if BUILDFLAG(IS_ANDROID) - source->AddResourcePath("images/product_logo.png", -diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc -index 2f6bcd7771..cd7becfed0 100644 ---- a/extensions/common/extension.cc -+++ b/extensions/common/extension.cc -@@ -97,13 +97,6 @@ bool IsManifestSupported(int manifest_version, - // Supported versions are always safe. - if (manifest_version >= kMinimumSupportedManifestVersion && - manifest_version <= kMaximumSupportedManifestVersion) { -- // Emit a warning for unpacked extensions on Manifest V2 warning that -- // MV2 is deprecated. -- if (type == Manifest::TYPE_EXTENSION && manifest_version == 2 && -- Manifest::IsUnpackedLocation(location) && -- !g_silence_deprecated_manifest_version_warnings) { -- *warning = errors::kManifestV2IsDeprecatedWarning; -- } - return true; - } - |