Extract l10n-related parts of NetworkScreenHandler to a helper file

chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.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/options/chromeos/cros_language_options_handler.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
-#include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/customization_document.h"
@@ skipping 28 matching lines @@
 
 bool IsBlacklisted(const std::string& language_code) {
   return language_code == "si";  // Sinhala
 }
 
 }  // namespace
 
 namespace chromeos {
 namespace options {
 
-const char kVendorOtherLanguagesListDivider[] =
-    "VENDOR_OTHER_LANGUAGES_LIST_DIVIDER";
+const char kMostRelevantLanguagesDivider[] = "MOST_RELEVANT_LANGUAGES_DIVIDER";
 
 CrosLanguageOptionsHandler::CrosLanguageOptionsHandler()
     : composition_extension_appended_(false),
       is_page_initialized_(false) {
   input_method::InputMethodManager::Get()->GetComponentExtensionIMEManager()->
       AddObserver(this);
 }
 
 CrosLanguageOptionsHandler::~CrosLanguageOptionsHandler() {
   input_method::InputMethodManager::Get()->GetComponentExtensionIMEManager()->
@@ skipping 116 matching lines @@
     input_method_list->Append(dictionary);
   }
 
   return input_method_list;
 }
 
 // static
 base::ListValue* CrosLanguageOptionsHandler::GetLanguageListInternal(
     const input_method::InputMethodDescriptors& descriptors,
     const std::vector<std::string>& base_language_codes,
+    const std::vector<std::string>& most_relevant_language_codes,
     const bool insert_divider) {
   const std::string app_locale = g_browser_process->GetApplicationLocale();
 
   std::set<std::string> language_codes;
   // Collect the language codes from the supported input methods.
   for (size_t i = 0; i < descriptors.size(); ++i) {
     const input_method::InputMethodDescriptor& descriptor = descriptors[i];
     const std::vector<std::string>& languages =
         descriptor.language_codes();
     for (size_t i = 0; i < languages.size(); ++i)
       language_codes.insert(languages[i]);
   }
 
-  const StartupCustomizationDocument* startup_manifest =
-      StartupCustomizationDocument::GetInstance();
-
-  const std::vector<std::string>& configured_locales =
-      startup_manifest->configured_locales();
-
   // Languages sort order.
   std::map<std::string, int /* index */> language_index;
-  for (size_t i = 0; i < configured_locales.size(); ++i) {
-    language_index[configured_locales[i]] = i;
+  for (size_t i = 0; i < most_relevant_language_codes.size(); ++i) {
+    language_index[most_relevant_language_codes[i]] = i;
   }
 
   // Map of display name -> {language code, native_display_name}.
   // In theory, we should be able to create a map that is sorted by
   // display names using ICU comparator, but doing it is hard, thus we'll
   // use an auxiliary vector to achieve the same result.
   typedef std::pair<std::string, base::string16> LanguagePair;
   typedef std::map<base::string16, LanguagePair> LanguageMap;
   LanguageMap language_map;
 
-  // The auxiliary vector mentioned above. (except vendor locales)
+  // The auxiliary vector mentioned above. (except the most relevant locales)
   std::vector<base::string16> display_names;
 
-  // Separate vector of vendor locales.
-  std::vector<base::string16> configured_locales_display_names(
-      configured_locales.size());
+  // Separate vector of the most relevant locales.
+  std::vector<base::string16> most_relevant_locales_display_names(
+      most_relevant_language_codes.size());
 
-  size_t configured_locales_count = 0;
+  size_t most_relevant_locales_count = 0;
 
   // Build the list of display names, and build the language map.
 
   // The list of configured locales might have entries not in
   // base_language_codes. If there are unsupported language variants,
   // but they resolve to backup locale within base_language_codes, also
   // add them to the list.
   for (std::map<std::string, int>::const_iterator iter = language_index.begin();
        iter != language_index.end();
        ++iter) {
@@ skipping 25 matching lines @@
 
     const base::string16 display_name =
         l10n_util::GetDisplayNameForLocale(language_id, app_locale, true);
     const base::string16 native_display_name =
         l10n_util::GetDisplayNameForLocale(
             language_id, language_id, true);
 
     language_map[display_name] =
         std::make_pair(language_id, native_display_name);
 
-    configured_locales_display_names[language_idx] = display_name;
-    ++configured_locales_count;
+    most_relevant_locales_display_names[language_idx] = display_name;
+    ++most_relevant_locales_count;
   }
 
   // Translate language codes, generated from input methods.
   for (std::set<std::string>::const_iterator iter = language_codes.begin();
        iter != language_codes.end(); ++iter) {
      // Exclude the language which is not in |base_langauge_codes| even it has
      // input methods.
     if (std::find(base_language_codes.begin(),
                   base_language_codes.end(),
                   *iter) == base_language_codes.end()) {
       continue;
     }
 
     const base::string16 display_name =
         l10n_util::GetDisplayNameForLocale(*iter, app_locale, true);
     const base::string16 native_display_name =
         l10n_util::GetDisplayNameForLocale(*iter, *iter, true);
 
     language_map[display_name] =
         std::make_pair(*iter, native_display_name);
 
     const std::map<std::string, int>::const_iterator index_pos =
         language_index.find(*iter);
     if (index_pos != language_index.end()) {
       base::string16& stored_display_name =
-          configured_locales_display_names[index_pos->second];
+          most_relevant_locales_display_names[index_pos->second];
       if (stored_display_name.empty()) {
         stored_display_name = display_name;
-        ++configured_locales_count;
+        ++most_relevant_locales_count;
       }
     } else {
       display_names.push_back(display_name);
     }
   }
-  DCHECK_EQ(display_names.size() + configured_locales_count,
+  DCHECK_EQ(display_names.size() + most_relevant_locales_count,
             language_map.size());
 
   // Build the list of display names, and build the language map.
   for (size_t i = 0; i < base_language_codes.size(); ++i) {
     // Skip this language if it was already added.
     if (language_codes.find(base_language_codes[i]) != language_codes.end())
       continue;
 
     // TODO(zork): Remove this blacklist when fonts are added to Chrome OS.
     // see: crbug.com/240586
     if (IsBlacklisted(base_language_codes[i]))
       continue;
 
     base::string16 display_name =
         l10n_util::GetDisplayNameForLocale(
             base_language_codes[i], app_locale, false);
     base::string16 native_display_name =
         l10n_util::GetDisplayNameForLocale(
             base_language_codes[i], base_language_codes[i], false);
     language_map[display_name] =
         std::make_pair(base_language_codes[i], native_display_name);
 
     const std::map<std::string, int>::const_iterator index_pos =
         language_index.find(base_language_codes[i]);
     if (index_pos != language_index.end()) {
-      configured_locales_display_names[index_pos->second] = display_name;
-      ++configured_locales_count;
+      most_relevant_locales_display_names[index_pos->second] = display_name;
+      ++most_relevant_locales_count;
     } else {
       display_names.push_back(display_name);
     }
   }
 
   // Sort display names using locale specific sorter.
   l10n_util::SortStrings16(app_locale, &display_names);
-  // Concatenate configured_locales_display_names and display_names.
+  // Concatenate most_relevant_locales_display_names and display_names.
   // Insert special divider in between.
   std::vector<base::string16> out_display_names;
-  for (size_t i = 0; i < configured_locales_display_names.size(); ++i) {
-    if (configured_locales_display_names[i].size() == 0)
+  for (size_t i = 0; i < most_relevant_locales_display_names.size(); ++i) {
+    if (most_relevant_locales_display_names[i].size() == 0)
       continue;
-    out_display_names.push_back(configured_locales_display_names[i]);
+    out_display_names.push_back(most_relevant_locales_display_names[i]);
   }
 
   base::string16 divider16;
   if (insert_divider) {
-    divider16 = base::ASCIIToUTF16(
-        insert_divider ? "" : kVendorOtherLanguagesListDivider);
+    divider16 = base::ASCIIToUTF16(kMostRelevantLanguagesDivider);
     out_display_names.push_back(divider16);
   }
 
   std::copy(display_names.begin(),
             display_names.end(),
             std::back_inserter(out_display_names));
 
   // Build the language list from the language map.
   base::ListValue* language_list = new base::ListValue();
   for (size_t i = 0; i < out_display_names.size(); ++i) {
     // Sets the directionality of the display language name.
     base::string16 display_name(out_display_names[i]);
     if (insert_divider && display_name == divider16) {
       // Insert divider.
       base::DictionaryValue* dictionary = new base::DictionaryValue();
-      dictionary->SetString("code", kVendorOtherLanguagesListDivider);
+      dictionary->SetString("code", kMostRelevantLanguagesDivider);
       language_list->Append(dictionary);
       continue;
     }
     bool markup_removal =
         base::i18n::UnadjustStringForLocaleDirection(&display_name);
     DCHECK(markup_removal);
     bool has_rtl_chars = base::i18n::StringContainsStrongRTLChars(display_name);
     std::string directionality = has_rtl_chars ? "rtl" : "ltr";
 
     const LanguagePair& pair = language_map[out_display_names[i]];
     base::DictionaryValue* dictionary = new base::DictionaryValue();
     dictionary->SetString("code", pair.first);
     dictionary->SetString("displayName", out_display_names[i]);
     dictionary->SetString("textDirection", directionality);
     dictionary->SetString("nativeDisplayName", pair.second);
     language_list->Append(dictionary);
   }
 
   return language_list;
 }
 
 // static
 base::ListValue* CrosLanguageOptionsHandler::GetAcceptLanguageList(
     const input_method::InputMethodDescriptors& descriptors) {
   // Collect the language codes from the supported accept-languages.
   const std::string app_locale = g_browser_process->GetApplicationLocale();
   std::vector<std::string> accept_language_codes;
   l10n_util::GetAcceptLanguagesForLocale(app_locale, &accept_language_codes);
-  return GetLanguageListInternal(descriptors, accept_language_codes, false);
+  return GetLanguageListInternal(
+      descriptors,
+      accept_language_codes,
+      StartupCustomizationDocument::GetInstance()->configured_locales(),
+      false);
 }
 
 // static
 base::ListValue* CrosLanguageOptionsHandler::GetUILanguageList(
-    const input_method::InputMethodDescriptors& descriptors) {
+    const input_method::InputMethodDescriptors& descriptors,
+    const std::vector<std::string>* most_relevant_language_codes) {
   // Collect the language codes from the available locales.
   return GetLanguageListInternal(
-      descriptors, l10n_util::GetAvailableLocales(), true);
+      descriptors,
+      l10n_util::GetAvailableLocales(),
+      most_relevant_language_codes
+          ? *most_relevant_language_codes
+          : StartupCustomizationDocument::GetInstance()->configured_locales(),
+      true);
 }
 
 base::ListValue*
     CrosLanguageOptionsHandler::ConvertInputMethodDescriptorsToIMEList(
         const input_method::InputMethodDescriptors& descriptors) {
   scoped_ptr<base::ListValue> ime_ids_list(new base::ListValue());
   for (size_t i = 0; i < descriptors.size(); ++i) {
     const input_method::InputMethodDescriptor& descriptor = descriptors[i];
     scoped_ptr<base::DictionaryValue> dictionary(new base::DictionaryValue());
     dictionary->SetString("id", descriptor.id());
@@ skipping 137 matching lines @@
         extension_ime_util::GetExtensionIDFromInputMethodID(input_method_id);
     const extensions::Extension* extension =
         enabled_extensions.GetByID(extension_id);
     if (extension)
       entry->SetString("extensionName", extension->name());
   }
 }
 
 }  // namespace options
 }  // namespace chromeos