Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 279dc744683e (bug 1352343)

Browse Source
This commit is contained in:
Sebastian Hengst 2017-10-10 22:05:03 +02:00
parent cfe1556078
commit 4ae6666726
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chrome/nsChromeRegistryChrome.cpp
View File

@ -739,7 +739,7 @@ nsChromeRegistryChrome::ManifestLocale(ManifestProcessingContext& cx, int lineno
if (mainPackage.Equals(package)) {
// We should refresh the LocaleService, since the available
// locales changed.
LocaleService::GetInstance()->AvailableLocalesChanged();
LocaleService::GetInstance()->OnAvailableLocalesChanged();
}
}

14
intl/locale/LocaleService.cpp
View File

@ -282,16 +282,16 @@ LocaleService::GetAvailableLocales(nsTArray<nsCString>& aRetVal)
void
LocaleService::AvailableLocalesChanged()
LocaleService::OnAvailableLocalesChanged()
{
MOZ_ASSERT(mIsServer, "This should only be called in the server mode.");
mAvailableLocales.Clear();
// In the future we may want to trigger here intl:available-locales-changed
LocalesChanged();
OnLocalesChanged();
}
void
LocaleService::RequestedLocalesChanged()
LocaleService::OnRequestedLocalesChanged()
{
MOZ_ASSERT(mIsServer, "This should only be called in the server mode.");
@ -304,12 +304,12 @@ LocaleService::RequestedLocalesChanged()
if (obs) {
obs->NotifyObservers(nullptr, "intl:requested-locales-changed", nullptr);
}
LocalesChanged();
OnLocalesChanged();
}
}
void
LocaleService::LocalesChanged()
LocaleService::OnLocalesChanged()
{
MOZ_ASSERT(mIsServer, "This should only be called in the server mode.");
@ -532,7 +532,7 @@ LocaleService::Observe(nsISupports *aSubject, const char *aTopic,
MOZ_ASSERT(mIsServer, "This should only be called in the server mode.");
if (!strcmp(aTopic, INTL_SYSTEM_LOCALES_CHANGED)) {
RequestedLocalesChanged();
OnRequestedLocalesChanged();
} else {
NS_ConvertUTF16toUTF8 pref(aData);
@ -545,7 +545,7 @@ LocaleService::Observe(nsISupports *aSubject, const char *aTopic,
if (pref.EqualsLiteral(MATCH_OS_LOCALE_PREF) ||
pref.EqualsLiteral(SELECTED_LOCALE_PREF) ||
pref.EqualsLiteral(ANDROID_OS_LOCALE_PREF)) {
RequestedLocalesChanged();
OnRequestedLocalesChanged();
}
}

6
intl/locale/LocaleService.h
View File

@ -213,9 +213,9 @@ public:
*
* This code should be called only in the server mode..
*/
void AvailableLocalesChanged();
void RequestedLocalesChanged();
void LocalesChanged();
void OnAvailableLocalesChanged();
void OnRequestedLocalesChanged();
void OnLocalesChanged();
/**
* Negotiates the best locales out of an ordered list of requested locales and