Files
helium/patches/contrib/ungoogled-chromium/disable-ai-search-shortcuts.patch

57 lines
2.6 KiB
C++

--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
@@ -117,22 +117,10 @@ void TemplateURLTableModel::Reload() {
extension_entries;
// Keywords that can be made the default first.
for (TemplateURL* template_url : urls) {
- // Skip @gemini if feature disabled.
- if (template_url->starter_pack_id() ==
- template_url_starter_pack_data::kGemini &&
- !OmniboxFieldTrial::IsStarterPackExpansionEnabled()) {
- continue;
- }
- // Skip @page if feature disabled.
- if (template_url->starter_pack_id() ==
- template_url_starter_pack_data::kPage &&
- !omnibox_feature_configs::ContextualSearch::Get().starter_pack_page) {
- continue;
- }
- // Skip @aimode if feature disabled.
- if (template_url->starter_pack_id() ==
- template_url_starter_pack_data::kAiMode &&
- !ai_mode_enabled_) {
+ // Disable all Google AI starter pack options
+ if (template_url->starter_pack_id() == template_url_starter_pack_data::kGemini ||
+ template_url->starter_pack_id() == template_url_starter_pack_data::kAiMode ||
+ template_url->starter_pack_id() == template_url_starter_pack_data::kPage) {
continue;
}
--- a/components/omnibox/browser/featured_search_provider.cc
+++ b/components/omnibox/browser/featured_search_provider.cc
@@ -295,20 +295,10 @@ void FeaturedSearchProvider::AddFeatured
for (TemplateURL* turl : turls) {
if (turl->starter_pack_id() > 0 &&
turl->is_active() == TemplateURLData::ActiveStatus::kTrue) {
- // Skip @gemini if feature disabled.
- if (turl->starter_pack_id() == template_url_starter_pack_data::kGemini &&
- !OmniboxFieldTrial::IsStarterPackExpansionEnabled()) {
- continue;
- }
- // Skip @page if feature disabled.
- if (turl->starter_pack_id() == template_url_starter_pack_data::kPage &&
- !omnibox_feature_configs::ContextualSearch::Get().starter_pack_page) {
- continue;
- }
- // Skip @aimode if feature disabled.
- if (turl->starter_pack_id() == template_url_starter_pack_data::kAiMode &&
- !OmniboxFieldTrial::IsAimStarterPackEnabled(
- client_->GetAimEligibilityService())) {
+ // Disable all Google AI starter pack options
+ if (turl->starter_pack_id() == template_url_starter_pack_data::kGemini ||
+ turl->starter_pack_id() == template_url_starter_pack_data::kAiMode ||
+ turl->starter_pack_id() == template_url_starter_pack_data::kPage) {
continue;
}
// The history starter pack engine is disabled in incognito mode.