From cb19a76635156097933dbbbda3103ae7960f2f35 Mon Sep 17 00:00:00 2001 From: Root <175176948+RKNF404@users.noreply.github.com> Date: Sat, 1 Mar 2025 12:12:31 -0500 Subject: [PATCH] fix: set all countries as EEA --- patches/search-selection.patch | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/patches/search-selection.patch b/patches/search-selection.patch index 6dfacc30..e60aeee1 100644 --- a/patches/search-selection.patch +++ b/patches/search-selection.patch @@ -1,21 +1,19 @@ -diff --git a/components/search_engines/search_engine_choice/search_engine_choice_service.cc b/components/search_engines/search_engine_choice/search_engine_choice_service.cc -index c152260117ccc..904423cc3095b 100644 ---- a/components/search_engines/search_engine_choice/search_engine_choice_service.cc -+++ b/components/search_engines/search_engine_choice/search_engine_choice_service.cc -@@ -256,13 +256,6 @@ SearchEngineChoiceService::GetStaticChoiceScreenConditions( - return SearchEngineChoiceScreenConditions::kAlreadyCompleted; - } +diff --git a/components/search_engines/search_engine_choice/search_engine_choice_utils.cc b/components/search_engines/search_engine_choice/search_engine_choice_utils.cc +index aa9f283b37a63..e50d9dd971e97 100644 +--- a/components/search_engines/search_engine_choice/search_engine_choice_utils.cc ++++ b/components/search_engines/search_engine_choice/search_engine_choice_utils.cc +@@ -142,9 +142,8 @@ ChoiceScreenData::~ChoiceScreenData() = default; + bool IsEeaChoiceCountry(int country_id) { + // Consider the search engine list command line country override as an EEA + // region country to display the search engine choice screen. +- return HasSearchEngineCountryListOverride() +- ? true +- : kEeaChoiceCountriesIds.contains(country_id); ++ // We want the search choice screen so we assume everything is EEA. ++ return true; + } -- int country_id = GetCountryId(); -- DVLOG(1) << "Checking country for choice screen, found: " -- << country_codes::CountryIDToCountryString(country_id); -- if (!IsEeaChoiceCountry(country_id)) { -- return SearchEngineChoiceScreenConditions::kNotInRegionalScope; -- } -- - // Initially exclude users with this type of override. Consult b/302675777 for - // next steps. - if (profile_prefs_->HasPrefPath(prefs::kSearchProviderOverrides)) { + void RecordChoiceScreenProfileInitCondition( diff --git a/chrome/browser/search_engine_choice/search_engine_choice_dialog_service_factory.cc b/chrome/browser/search_engine_choice/search_engine_choice_dialog_service_factory.cc index 96286eaf96db2..75f0eee1d82c4 100644 --- a/chrome/browser/search_engine_choice/search_engine_choice_dialog_service_factory.cc