Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / ui / base / l10n / l10n_util.cc

diff --git a/src/ui/base/l10n/l10n_util.cc b/src/ui/base/l10n/l10n_util.cc
index da409a0..70a1c20 100644 (file)
--- a/src/ui/base/l10n/l10n_util.cc
+++ b/src/ui/base/l10n/l10n_util.cc
@@ -263,12 +263,6 @@ void AdjustParagraphDirectionality(base::string16* paragraph) {
 #endif
 }
 
-#if defined(OS_WIN)
-std::string GetCanonicalLocale(const std::string& locale) {
-  return base::i18n::GetCanonicalLocale(locale.c_str());
-}
-#endif
-
 struct AvailableLocalesTraits
     : base::DefaultLazyInstanceTraits<std::vector<std::string> > {
   static std::vector<std::string>* New(void* instance) {
@@ -313,6 +307,10 @@ base::LazyInstance<std::vector<std::string>, AvailableLocalesTraits>
 
 namespace l10n_util {
 
+std::string GetCanonicalLocale(const std::string& locale) {
+  return base::i18n::GetCanonicalLocale(locale.c_str());
+}
+
 bool CheckAndResolveLocale(const std::string& locale,
                            std::string* resolved_locale) {
 #if defined(OS_MACOSX)