Move RTL related functions from app/l10n_util to base/i18n/rtl...

chrome/browser/language_combobox_model.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/language_combobox_model.h"
 
 #include "app/l10n_util.h"
+#include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/pref_service.h"
 #include "grit/generated_resources.h"
 #include "unicode/uloc.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // LanguageList used to enumerate native names corresponding to the
 // language code (e.g. English (United States) for en-US)
@@ skipping 61 matching lines @@
   // If the name is the same in the native language and local language,
   // don't show it twice.
   if (it->second.native_name == locale_names_[index])
     return it->second.native_name;
 
   // We must add directionality formatting to both the native name and the
   // locale name in order to avoid text rendering problems such as misplaced
   // parentheses or languages appearing in the wrong order.
   std::wstring locale_name_localized;
   std::wstring locale_name;
-  if (l10n_util::AdjustStringForLocaleDirection(locale_names_[index],
-                                                &locale_name_localized))
+  if (base::i18n::AdjustStringForLocaleDirection(locale_names_[index],
+                                                 &locale_name_localized))
     locale_name.assign(locale_name_localized);
   else
     locale_name.assign(locale_names_[index]);
 
   std::wstring native_name_localized;
   std::wstring native_name;
-  if (l10n_util::AdjustStringForLocaleDirection(it->second.native_name,
-                                                &native_name_localized))
+  if (base::i18n::AdjustStringForLocaleDirection(it->second.native_name,
+                                                 &native_name_localized))
     native_name.assign(native_name_localized);
   else
     native_name.assign(it->second.native_name);
 
   // We used to have a localizable template here, but none of translators
   // changed the format. We also want to switch the order of locale_name
   // and native_name without going back to translators.
   std::wstring formatted_item;
   SStringPrintf(&formatted_item, L"%ls - %ls", locale_name.c_str(),
                 native_name.c_str());
-  if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT)
+  if (base::i18n::IsRTL())
     // Somehow combo box (even with LAYOUTRTL flag) doesn't get this
     // right so we add RTL BDO (U+202E) to set the direction
     // explicitly.
     formatted_item.insert(0, L"\x202E");
   return formatted_item;
 }
 
 // Return the locale for the given index.  E.g., may return pt-BR.
 std::string LanguageList::GetLocaleFromIndex(int index) const {
   DCHECK(static_cast<int>(locale_names_.size()) > index);
@@ skipping 42 matching lines @@
     local_state = g_browser_process->local_state();
   else
     local_state = profile_->GetPrefs();
 
   DCHECK(local_state);
   const std::string& current_locale =
       WideToASCII(local_state->GetString(prefs.c_str()));
 
   return GetIndexFromLocale(current_locale);
 }