Skip to content

fix: search selection prompt #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 2, 2025
Merged

fix: search selection prompt #222

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 15 additions & 17 deletions patches/search-selection.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down