| Index: components/search_engines/template_url_prepopulate_data.cc
|
| diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
|
| index a8e7fe51514b28e13d90ff06f0b93ed32311ccdc..56d76a6829ab2a3e72169fe828020b6626cd5cb1 100644
|
| --- a/components/search_engines/template_url_prepopulate_data.cc
|
| +++ b/components/search_engines/template_url_prepopulate_data.cc
|
| @@ -537,12 +537,16 @@ int CountryCharsToCountryIDWithUpdate(char c1, char c2) {
|
| return CountryCharsToCountryID(c1, c2);
|
| }
|
|
|
| +#if !defined(OS_WIN) && !defined(OS_MACOSX)
|
| +
|
| int CountryStringToCountryID(const std::string& country) {
|
| return (country.length() == 2)
|
| ? CountryCharsToCountryIDWithUpdate(country[0], country[1])
|
| : kCountryIDUnknown;
|
| }
|
|
|
| +#endif
|
| +
|
| #if defined(OS_WIN)
|
|
|
| // For reference, a list of GeoIDs can be found at
|
| @@ -1038,6 +1042,7 @@ std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
|
| }
|
|
|
| #if defined(OS_ANDROID)
|
| +
|
| std::vector<std::unique_ptr<TemplateURLData>> GetLocalPrepopulatedEngines(
|
| const std::string& locale,
|
| PrefService* prefs) {
|
| @@ -1049,6 +1054,7 @@ std::vector<std::unique_ptr<TemplateURLData>> GetLocalPrepopulatedEngines(
|
|
|
| return GetPrepopulationSetFromCountryID(country_id);
|
| }
|
| +
|
| #endif
|
|
|
| std::vector<const PrepopulatedEngine*> GetAllPrepopulatedEngines() {
|
|
|