| Index: chrome_frame/simple_resource_loader.cc
|
| diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc
|
| index 89a51d721361775631b060f3043bde4766788ff8..324c5cac7fdbd6a899adff27eecd79e90c5e40b6 100644
|
| --- a/chrome_frame/simple_resource_loader.cc
|
| +++ b/chrome_frame/simple_resource_loader.cc
|
| @@ -88,8 +88,9 @@ SimpleResourceLoader::SimpleResourceLoader()
|
| std::vector<std::wstring> language_tags;
|
|
|
| // First, try the locale dictated by policy and its fallback.
|
| - PushBackWithFallbackIfAbsent(Singleton<PolicySettings>()->ApplicationLocale(),
|
| - &language_tags);
|
| + PushBackWithFallbackIfAbsent(
|
| + PolicySettings::GetInstance()->ApplicationLocale(),
|
| + &language_tags);
|
|
|
| // Next, try the thread, process, user, system languages.
|
| GetPreferredLanguages(&language_tags);
|
| @@ -115,6 +116,11 @@ SimpleResourceLoader::~SimpleResourceLoader() {
|
| }
|
|
|
| // static
|
| +SimpleResourceLoader* SimpleResourceLoader::instance() {
|
| + return Singleton<SimpleResourceLoader>::get();
|
| +}
|
| +
|
| +// static
|
| void SimpleResourceLoader::GetPreferredLanguages(
|
| std::vector<std::wstring>* language_tags) {
|
| DCHECK(language_tags);
|
|
|