diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 01:36:40 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 01:36:40 +0000 |
| commit | 027448efcc1759509328d077458925a4878dee5e (patch) | |
| tree | 269a54d9d355c059181bf639b3790a567cb3d771 /ui/base/l10n | |
| parent | 472e58a7d65088f589fc4fc064641fb40f0b34ab (diff) | |
| download | chromium_src-027448efcc1759509328d077458925a4878dee5e.zip chromium_src-027448efcc1759509328d077458925a4878dee5e.tar.gz chromium_src-027448efcc1759509328d077458925a4878dee5e.tar.bz2 | |
Revert "Switch to using .pak files for locale data on Windows." (r97941)
Revert "Fix a bug where windows can't find the locale paks." (r97951)
Revert "Fix the windows build." (r97954)
TBR=tony@chromium.org
Review URL: http://codereview.chromium.org/7717017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97968 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/l10n')
| -rw-r--r-- | ui/base/l10n/l10n_util.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/base/l10n/l10n_util.cc b/ui/base/l10n/l10n_util.cc index ee4bb7c..cabda81 100644 --- a/ui/base/l10n/l10n_util.cc +++ b/ui/base/l10n/l10n_util.cc @@ -36,8 +36,11 @@ namespace { -static const FilePath::CharType kLocaleFileExtension[] = - FILE_PATH_LITERAL(".pak"); +#if defined(OS_WIN) +static const FilePath::CharType kLocaleFileExtension[] = L".dll"; +#elif defined(OS_POSIX) +static const FilePath::CharType kLocaleFileExtension[] = ".pak"; +#endif static const char* const kAcceptLanguageList[] = { "af", // Afrikaans |