Extract l10n-related parts of NetworkScreenHandler to a helper file

chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CROS_LANGUAGE_OPTIONS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CROS_LANGUAGE_OPTIONS_HANDLER_H_
 
+#include <string>
+#include <vector>
+
 #include "base/compiler_specific.h"
 #include "chrome/browser/ui/webui/options/language_options_handler.h"
 #include "chromeos/ime/component_extension_ime_manager.h"
 #include "chromeos/ime/input_method_descriptor.h"
 
 namespace chromeos {
 namespace options {
 
-// GetUILanguageList() returns concatenated list of list of vendor languages
-// followed by other languages. An entry with "code" attribute set to this value
-// is inserted in between.
-extern const char kVendorOtherLanguagesListDivider[];
+// GetUILanguageList() returns a concatenated list of the most relevant
+// languages followed by all others. An entry with its "code" attribute set to
+// this value is inserted in between.
+extern const char kMostRelevantLanguagesDivider[];
 
 // Language options page UI handler for Chrome OS.  For non-Chrome OS,
 // see LanguageOptionsHnadler.
 class CrosLanguageOptionsHandler
     : public ::options::LanguageOptionsHandlerCommon,
       public ComponentExtensionIMEManager::Observer {
  public:
   CrosLanguageOptionsHandler();
   virtual ~CrosLanguageOptionsHandler();
 
@@ skipping 14 matching lines @@
   // Note that true in languageCodeSet does not mean anything. We just use
   // the dictionary as a set.
   static base::ListValue* GetInputMethodList(
       const input_method::InputMethodDescriptors& descriptors);
 
   // Gets the list of accept languages with the given input descriptors.
   // Listed languages will be used as Accept-Language header.
   // The return value will look like:
   // [{'code': 'fi', 'displayName': 'Finnish', 'nativeDisplayName': 'suomi'},
   //  ...]
-  // "most relevant" languages, as set in initial_locale in VPD, will be first
+  // The most relevant languages, as set in initial_locale in VPD, will be first
   // in the list.
   static base::ListValue* GetAcceptLanguageList(
       const input_method::InputMethodDescriptors& descriptors);
 
   // Gets the list of UI languages with the given input descriptors.
   // The return value will look like:
   // [{'code': 'fi', 'displayName': 'Finnish', 'nativeDisplayName': 'suomi'},
   //  ...]
-  // "most relevant" languages, as set in initial_locale in VPD, will be first
-  // in the list.
-  // An entry with "code" attribute set to kVendorOtherLanguagesListDivider is
-  // used as a divider to separate "most relevant" languages against other.
+  // The |most_relevant_language_codes| will be first in the list. If
+  // |most_relevant_language_codes| is NULL, a list of most relevant languages
+  // is read from initial_locale in VPD. An entry with its "code" attribute set
+  // to kMostRelevantLanguagesDivider is inserted between the most relevant
+  // languages and all others.
   static base::ListValue* GetUILanguageList(

[Nikita (slow), 2014/07/17 06:14:54]

How about moving GetUILanguageList/GetLanguageListInternal out of
CrosLanguageOptionsHandler to the l10n_util.h.

This will minimize its dependencies on src/chrome and potentially can be moved
later out of src/chrome if needed.

[bartfab (slow), 2014/07/21 14:28:29]

Done.

-      const input_method::InputMethodDescriptors& descriptors);
+      const input_method::InputMethodDescriptors& descriptors,
+      const std::vector<std::string>* most_relevant_language_codes);
 
   // Converts input method descriptors to the list of input methods.
   // The return value will look like:
   // [{'id': '_ext_ime_nejguenhnsnjnwychcnsdsdjketest',
   //   'displayName': 'Sample IME'},  ...]
   static base::ListValue* ConvertInputMethodDescriptorsToIMEList(
       const input_method::InputMethodDescriptors& descriptors);
 
  private:
   // LanguageOptionsHandlerCommon implementation.
@@ skipping 12 matching lines @@
   void InputMethodEnableCallback(const base::ListValue* args);
 
   // Called when the input method options page is opened.
   // |args| will contain the input method ID as string (ex. "mozc").
   void InputMethodOptionsOpenCallback(const base::ListValue* args);
 
   // ComponentExtensionIMEManager::Observer override.
   virtual void OnImeComponentExtensionInitialized() OVERRIDE;
 
   // Gets the list of languages with |descriptors| based on
-  // |base_language_codes|.
-  // |insert_divider| means to insert entry with "code" attribute set to
-  // kVendorOtherLanguagesListDivider between "most relevant" languages and
-  // other.
+  // |base_language_codes|. The |most_relevant_language_codes| will be first in
+  // the list. If |insert_divider| is true, an entry with its "code" attribute
+  // set to kMostRelevantLanguagesDivider is placed between the most relevant
+  // languages and all others.
   static base::ListValue* GetLanguageListInternal(
       const input_method::InputMethodDescriptors& descriptors,
       const std::vector<std::string>& base_language_codes,
+      const std::vector<std::string>& most_relevant_language_codes,
       bool insert_divider);
 
   // OptionsPageUIHandler implementation.
   virtual void InitializePage() OVERRIDE;
 
   // Adds the name of the extension that provides the IME to each entry in the
   // |list| of extension IMEs.
   void AddImeProvider(base::ListValue* list);
 
   // True if the component extension list was appended into input method list.
   bool composition_extension_appended_;
 
   // True if this page was initialized.
   bool is_page_initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(CrosLanguageOptionsHandler);
 };
 
 }  // namespace options
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CROS_LANGUAGE_OPTIONS_HANDLER_H_