Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[cr134] [Android] TemplateUrlService.isEeaChoiceCountry was removed

Browse Source 
Related Chromium change:
https://source.chromium.org/chromium/chromium/src/+/25de988ad1d08cf2713249eb412ca42033a45b7a

	rcaps: Switch to IsInEeaCountry from rcaps in Java code

	Removes TemplateUrlService#IsEeaCountry from the Java class, replacing
	it with RegionalCapabilitiesService#IsInEeaCountry calls.

	Bug: 328040066
	Change-Id: I8bf9240cecb5b5394640221f62a68948e89aa388
	Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6190388
This commit is contained in:
AlexeyBarabash
2025-02-18 12:46:57 +00:00
committed by Claudio DeSouza
parent dc58b590ef
commit cf2ea2fe97
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/quick_search_engines/utils/QuickSearchEnginesUtil.java
+10 -3
View File
@@ -14,10 +14,12 @@ import org.chromium.chrome.browser.app.BraveActivity;
import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.quick_search_engines.settings.QuickSearchEnginesModel;
import org.chromium.chrome.browser.regional_capabilities.RegionalCapabilitiesServiceFactory;
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
import org.chromium.chrome.browser.search_engines.settings.SearchEngineAdapter;
import org.chromium.chrome.browser.settings.BraveSearchEngineUtils;
import org.chromium.chrome.browser.util.SharedPreferencesHelper;
import org.chromium.components.regional_capabilities.RegionalCapabilitiesService;
import org.chromium.components.search_engines.TemplateUrl;
import org.chromium.components.search_engines.TemplateUrlService;
@@ -113,10 +115,13 @@ public class QuickSearchEnginesUtil {
// Get template URL service and default search engine
TemplateUrlService templateUrlService = TemplateUrlServiceFactory.getForProfile(profile);
TemplateUrl defaultSearchEngine = templateUrlService.getDefaultSearchEngineTemplateUrl();
RegionalCapabilitiesService regionalCapabilities =
RegionalCapabilitiesServiceFactory.getForProfile(profile);
// Get sorted and filtered list of template URLs
List<TemplateUrl> templateUrls =
getSortedTemplateUrls(templateUrlService, defaultSearchEngine);
getSortedTemplateUrls(
templateUrlService, defaultSearchEngine, regionalCapabilities);
// Get existing or create new search engines map
Map<String, QuickSearchEnginesModel> searchEnginesMap = getOrCreateSearchEnginesMap();
@@ -139,11 +144,13 @@ public class QuickSearchEnginesUtil {
/** Gets sorted and filtered list of template URLs */
private static List<TemplateUrl> getSortedTemplateUrls(
TemplateUrlService service, TemplateUrl defaultSearchEngine) {
TemplateUrlService service,
TemplateUrl defaultSearchEngine,
RegionalCapabilitiesService regionalCapabilities) {
List<TemplateUrl> templateUrls = service.getTemplateUrls();
// Sort and filter unnecessary template URLs based on region
SearchEngineAdapter.sortAndFilterUnnecessaryTemplateUrl(
templateUrls, defaultSearchEngine, service.isEeaChoiceCountry());
templateUrls, defaultSearchEngine, regionalCapabilities.isInEeaCountry());
return templateUrls;
}