Fixed failure to add language in language settings page.

chrome/browser/ui/webui/options2/language_options_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/language_options_handler2.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 62 matching lines @@
   std::vector<string16> display_names;
 
   // Build the list of display names, and build the language map.
   for (size_t i = 0; i < language_codes.size(); ++i) {
     string16 display_name =
         l10n_util::GetDisplayNameForLocale(language_codes[i], app_locale,
                                            false);
     string16 native_display_name =
         l10n_util::GetDisplayNameForLocale(language_codes[i], language_codes[i],
                                            false);
-    base::i18n::AdjustStringForLocaleDirection(&native_display_name);
     display_names.push_back(display_name);
     language_map[display_name] =
         std::make_pair(language_codes[i], native_display_name);
   }
   DCHECK_EQ(display_names.size(), language_map.size());
 
   // Sort display names using locale specific sorter.
   l10n_util::SortStrings16(app_locale, &display_names);
 
   // Build the language list from the language map.
   ListValue* language_list = new ListValue();
   for (size_t i = 0; i < display_names.size(); ++i) {
-    const LanguagePair& pair = language_map[display_names[i]];
-    bool has_rtl_chars = base::i18n::StringContainsStrongRTLChars(
-        display_names[i]);
+    string16& display_name = display_names[i];
+    string16 adjusted_display_name(display_name);
+    base::i18n::AdjustStringForLocaleDirection(&adjusted_display_name);
+
+    const LanguagePair& pair = language_map[display_name];
+    string16 adjusted_native_display_name(pair.second);
+    base::i18n::AdjustStringForLocaleDirection(&adjusted_native_display_name);
+
+    bool has_rtl_chars = base::i18n::StringContainsStrongRTLChars(display_name);
     std::string directionality = has_rtl_chars ? "rtl" : "ltr";
+
     DictionaryValue* dictionary = new DictionaryValue();
     dictionary->SetString("code",  pair.first);
-    dictionary->SetString("displayName", display_names[i]);
+    dictionary->SetString("displayName", adjusted_display_name);
     dictionary->SetString("textDirection", directionality);
-    dictionary->SetString("nativeDisplayName", pair.second);
+    dictionary->SetString("nativeDisplayName", adjusted_native_display_name);
     language_list->Append(dictionary);
   }
 
   return language_list;
 }
 
 string16 LanguageOptionsHandler::GetProductName() {
   return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
 }
 
 void LanguageOptionsHandler::SetApplicationLocale(
     const std::string& language_code) {
   PrefService* pref_service = g_browser_process->local_state();
   pref_service->SetString(prefs::kApplicationLocale, language_code);
 }
 
 void LanguageOptionsHandler::RestartCallback(const ListValue* args) {
   content::RecordAction(UserMetricsAction("LanguageOptions_Restart"));
   BrowserList::AttemptRestart();
 }
 
 }  // namespace options2