diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 7 | ||||
| -rw-r--r-- | chrome/common/l10n_util.cc | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 8989550..ee11066 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -19,6 +19,7 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" @@ -31,7 +32,6 @@ #include "chrome/browser/plugin_service.h" #include "chrome/browser/printing/print_job_manager.h" #include "chrome/common/clipboard_service.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/accelerator_handler.h" #include "chrome/views/view_storage.h" #elif defined(OS_POSIX) @@ -260,15 +260,10 @@ printing::PrintJobManager* BrowserProcessImpl::print_job_manager() { const std::wstring& BrowserProcessImpl::GetApplicationLocale() { DCHECK(CalledOnValidThread()); -#if defined(OS_WIN) if (locale_.empty()) { locale_ = l10n_util::GetApplicationLocale(local_state()->GetString( prefs::kApplicationLocale)); } -#else - NOTIMPLEMENTED(); - // TODO(port): port l10n_util -#endif return locale_; } diff --git a/chrome/common/l10n_util.cc b/chrome/common/l10n_util.cc index a8056a7..dbe34c7 100644 --- a/chrome/common/l10n_util.cc +++ b/chrome/common/l10n_util.cc @@ -285,8 +285,14 @@ std::wstring GetApplicationLocale(const std::wstring& pref_locale) { if (IsLocaleAvailable(fallback_locale, locale_path)) return fallback_locale; +#if defined(OS_WIN) // No DLL, we shouldn't get here. NOTREACHED(); +#else + // We need a locale data file. + NOTIMPLEMENTED(); +#endif + return std::wstring(); } |