Skip to content

feat: Search engine choice #216

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 2 commits into from
Feb 22, 2025
Merged

feat: Search engine choice #216

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae4ea5c
feat: enable search engine selection screen in non-EEA
RKNF404 Feb 21, 2025
30e837c
chore: enable selection screen without the flag
RKNF404 Feb 21, 2025
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
33 changes: 33 additions & 0 deletions patches/search-selection.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
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;
}

- 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)) {
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
+++ b/chrome/browser/search_engine_choice/search_engine_choice_dialog_service_factory.cc
@@ -128,10 +128,6 @@ SearchEngineChoiceDialogServiceFactory::BuildServiceInstanceForBrowserContext(

base::CommandLine* const command_line =
base::CommandLine::ForCurrentProcess();
- if (!g_is_chrome_build &&
- !command_line->HasSwitch(switches::kForceSearchEngineChoiceScreen)) {
- return nullptr;
- }

if (command_line->HasSwitch(switches::kNoFirstRun) &&
!command_line->HasSwitch(