From: uazo Date: Mon, 26 Feb 2024 16:35:16 +0000 Subject: Disable Compose feature License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- chrome/browser/renderer_context_menu/BUILD.gn | 6 +++--- chrome/browser/ui/webui/settings/settings_ui.cc | 4 ++-- components/compose/core/browser/compose_features.cc | 2 ++ components/compose/features.gni | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/chrome/browser/renderer_context_menu/BUILD.gn b/chrome/browser/renderer_context_menu/BUILD.gn --- a/chrome/browser/renderer_context_menu/BUILD.gn +++ b/chrome/browser/renderer_context_menu/BUILD.gn @@ -89,7 +89,7 @@ source_set("impl") { "//chrome/browser/apps/app_service", "//chrome/browser/apps/platform_apps", "//chrome/browser/autocomplete", - "//chrome/browser/compose", + #"//chrome/browser/compose", "//chrome/browser/custom_handlers", "//chrome/browser/devtools", "//chrome/browser/glic", @@ -232,7 +232,7 @@ static_library("test_support") { "render_view_context_menu_test_util.cc", ] public_deps += [ "//extensions/buildflags" ] - deps += [ "//chrome/browser/compose" ] + #deps += [ "//chrome/browser/compose" ] } if (is_chromeos) { @@ -325,7 +325,7 @@ if (!is_android) { ":test_support", "//base/test:test_support", "//chrome/browser", - "//chrome/browser/compose:test_support", + #"//chrome/browser/compose:test_support", "//chrome/browser/devtools", "//chrome/browser/pdf:pdf_extension_test_utils", "//chrome/browser/search_engines", diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui/webui/settings/settings_ui.cc --- a/chrome/browser/ui/webui/settings/settings_ui.cc +++ b/chrome/browser/ui/webui/settings/settings_ui.cc @@ -21,7 +21,7 @@ #include "chrome/browser/browser_features.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/commerce/shopping_service_factory.h" -#include "chrome/browser/compose/compose_enabling.h" +// #include "chrome/browser/compose/compose_enabling.h" #include "chrome/browser/glic/public/glic_enabling.h" #include "chrome/browser/glic/public/glic_keyed_service.h" #include "chrome/browser/history_embeddings/history_embeddings_utils.h" @@ -367,7 +367,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui) base::FeatureList::IsEnabled(permissions::features::kKeyboardLockPrompt)); #if BUILDFLAG(ENABLE_COMPOSE) - const bool compose_enabled = ComposeEnabling::IsEnabledForProfile(profile); + const bool compose_enabled = false; const bool compose_visible = ComposeEnabling::IsSettingVisible(profile); #else const bool compose_enabled = false; diff --git a/components/compose/core/browser/compose_features.cc b/components/compose/core/browser/compose_features.cc --- a/components/compose/core/browser/compose_features.cc +++ b/components/compose/core/browser/compose_features.cc @@ -73,4 +73,6 @@ BASE_FEATURE(kComposeAllowOnDeviceExecution, base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kComposeUpfrontInputModes, base::FEATURE_ENABLED_BY_DEFAULT); +SET_CROMITE_FEATURE_DISABLED(kEnableCompose); +SET_CROMITE_FEATURE_DISABLED(kComposeEligible); } // namespace compose::features diff --git a/components/compose/features.gni b/components/compose/features.gni --- a/components/compose/features.gni +++ b/components/compose/features.gni @@ -4,5 +4,5 @@ declare_args() { # Whether Compose is enabled in the build. - enable_compose = is_mac || is_win || is_linux || is_chromeos + enable_compose = false } --