diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 00:04:48 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 00:04:48 +0000 |
| commit | ce4b6a9dbb6ac14810294205185d385f066457fc (patch) | |
| tree | 6c152e7d0e6ffc89b5c80eadbab5f24ec6ed7424 /app/resource_bundle_mac.mm | |
| parent | a437e4c7a38a959f3412df30b9b066c5d869ccc4 (diff) | |
| download | chromium_src-ce4b6a9dbb6ac14810294205185d385f066457fc.zip chromium_src-ce4b6a9dbb6ac14810294205185d385f066457fc.tar.gz chromium_src-ce4b6a9dbb6ac14810294205185d385f066457fc.tar.bz2 | |
Make BrowserProcess::GetApplicationLocale thread safe and migrate
callers of l10n_util::GetApplicationLocale to use this instead.
In the browser process, it's wrong to call
l10n_util::GetApplicationLocale with an empty string because then
it won't consider the user pref value when resolving the locale.
On Linux, it's also wrong to call l10n_util::GetApplicationLocale
after startup because the call touches disk and on Linux, we assume
that all of the program files can be deleted after startup (so
updates in place can work).
Review URL: http://codereview.chromium.org/476002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34206 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/resource_bundle_mac.mm')
| -rw-r--r-- | app/resource_bundle_mac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/resource_bundle_mac.mm b/app/resource_bundle_mac.mm index 94ef31a..9d14440 100644 --- a/app/resource_bundle_mac.mm +++ b/app/resource_bundle_mac.mm @@ -29,8 +29,8 @@ FilePath ResourceBundle::GetResourcesFilePath() { } // static -FilePath ResourceBundle::GetLocaleFilePath(const std::wstring& pref_locale) { - DLOG_IF(WARNING, !pref_locale.empty()) +FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale) { + DLOG_IF(WARNING, !app_locale.empty()) << "ignoring requested locale in favor of NSBundle's selection"; return GetResourcesPakFilePath(@"locale"); } |