Chromium Code Reviews| Index: chrome/common/resource_bundle_linux.cc |
| diff --git a/chrome/common/resource_bundle_linux.cc b/chrome/common/resource_bundle_linux.cc |
| index 4d512154fbe9a5eaef480613006082fc4ff2fd0d..0a5112f1dd2832c06d599910af1e3292f3875fcd 100644 |
| --- a/chrome/common/resource_bundle_linux.cc |
| +++ b/chrome/common/resource_bundle_linux.cc |
| @@ -39,12 +39,15 @@ void ResourceBundle::LoadResources(const std::wstring& pref_locale) { |
| bool success = resources_data_->Load(resources_data_path); |
| DCHECK(success) << "failed to load chrome.pak"; |
| - FilePath locale_path; |
| - PathService::Get(chrome::DIR_LOCALES, &locale_path); |
| - // TODO(tc): Handle other locales properly. |
| - // http://code.google.com/p/chromium/issues/detail?id=8125 |
| - locale_path = locale_path.Append(FILE_PATH_LITERAL("en-US.pak")); |
| DCHECK(locale_resources_data_ == NULL) << "locale data already loaded!"; |
| + const FilePath& locale_path = GetLocaleFilePath(pref_locale); |
| + if (locale_path.value().empty()) { |
| + // It's possible that there are no locale dlls found, in which case we just |
| + // return. |
| + NOTREACHED(); |
| + return; |
|
Evan Martin
2009/03/06 20:39:53
Shouldn't we die horribly here?
|
| + } |
| + |
| locale_resources_data_ = new base::DataPack; |
| success = locale_resources_data_->Load(locale_path); |
| DCHECK(success) << "failed to load locale pak file"; |