Skip to content
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.

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

Fix ads locale_helper crash on Windows/Linux/Android #3825

Merged
merged 1 commit into from Oct 30, 2019
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Fix ads locale_helper crash on Windows/Linux/Android

  • Loading branch information
tmancey committed Oct 30, 2019
commit f5a8645c8202296adf53045645b1dbae53567b86
@@ -16,12 +16,12 @@ const std::string LocaleHelperAndroid::GetLocale() const {
return base::android::GetDefaultLocaleString();
}

LocaleHelperAndroid* LocaleHelperAndroid::GetInstance() {
LocaleHelperAndroid* LocaleHelperAndroid::GetInstanceImpl() {
return base::Singleton<LocaleHelperAndroid>::get();
}

LocaleHelper* LocaleHelper::GetInstanceImpl() {
return LocaleHelperAndroid::GetInstance();
return LocaleHelperAndroid::GetInstanceImpl();
}

const std::string LocaleHelperAndroid::GetCountryCode(
@@ -47,5 +47,4 @@ const std::string LocaleHelperAndroid::GetCountryCode(
return country_code;
}


} // namespace brave_ads
@@ -40,7 +40,7 @@ LocaleHelperLinux* LocaleHelperLinux::GetInstanceImpl() {
}

LocaleHelper* LocaleHelper::GetInstanceImpl() {
return LocaleHelperLinux::GetInstance();
return LocaleHelperLinux::GetInstanceImpl();
}

} // namespace brave_ads
@@ -44,7 +44,7 @@ LocaleHelperWin* LocaleHelperWin::GetInstanceImpl() {
}

LocaleHelper* LocaleHelper::GetInstanceImpl() {
return LocaleHelperWin::GetInstance();
return LocaleHelperWin::GetInstanceImpl();
}

} // namespace brave_ads
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.