Fixed bidi RTL check failures on font settings page.

chrome/browser/ui/webui/options2/font_settings_handler2.cc

 // Copyright (c) 2012 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/ui/webui/options2/font_settings_handler2.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 115 matching lines @@
 }
 
 void FontSettingsHandler::HandleFetchFontsData(const ListValue* args) {
   content::GetFontListAsync(
       base::Bind(&FontSettingsHandler::FontsListHasLoaded,
                  base::Unretained(this)));
 }
 
 void FontSettingsHandler::FontsListHasLoaded(
     scoped_ptr<base::ListValue> list) {
+  // Selects the directionality for the fonts in the given list.
+  for (size_t i = 0; i < list->GetSize(); i++) {
+    ListValue* font;
+    bool has_font = list->GetList(i, &font);
+    DCHECK(has_font);
+    string16 value;
+    bool has_value = font->GetString(1, &value);
+    DCHECK(has_value);
+    bool has_rtl_chars = base::i18n::StringContainsStrongRTLChars(value);
+    font->Append(Value::CreateStringValue(has_rtl_chars ? "rtl" : "ltr"));
+  }
+
   ListValue encoding_list;
   const std::vector<CharacterEncoding::EncodingInfo>* encodings;
   PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
   encodings = CharacterEncoding::GetCurrentDisplayEncodings(
       g_browser_process->GetApplicationLocale(),
       pref_service->GetString(prefs::kStaticEncodings),
       pref_service->GetString(prefs::kRecentlySelectedEncoding));
   DCHECK(encodings);
   DCHECK(!encodings->empty());
 
   std::vector<CharacterEncoding::EncodingInfo>::const_iterator it;
   for (it = encodings->begin(); it != encodings->end(); ++it) {
     ListValue* option = new ListValue();
     if (it->encoding_id) {
       int cmd_id = it->encoding_id;
       std::string encoding =
       CharacterEncoding::GetCanonicalEncodingNameByCommandId(cmd_id);
       string16 name = it->encoding_display_name;
-      base::i18n::AdjustStringForLocaleDirection(&name);
+      bool has_rtl_chars = base::i18n::StringContainsStrongRTLChars(name);
       option->Append(Value::CreateStringValue(encoding));
       option->Append(Value::CreateStringValue(name));
+      option->Append(Value::CreateStringValue(has_rtl_chars ? "rtl" : "ltr"));
     } else {
       // Add empty name/value to indicate a separator item.
       option->Append(Value::CreateStringValue(""));
       option->Append(Value::CreateStringValue(""));
     }
     encoding_list.Append(option);
   }
 
   ListValue selected_values;
   selected_values.Append(Value::CreateStringValue(MaybeGetLocalizedFontName(
@@ skipping 63 matching lines @@
       "FontSettings.setUpFixedFontSample", font_value, size_value);
 }
 
 void FontSettingsHandler::SetUpMinimumFontSample() {
   base::FundamentalValue size_value(minimum_font_size_.GetValue());
   web_ui()->CallJavascriptFunction("FontSettings.setUpMinimumFontSample",
                                    size_value);
 }
 
 }  // namespace options2