Remove ExtraLanguage entries from InputMethodUtil.

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 <map>
 #include <set>
 #include <vector>
 
@@ skipping 147 matching lines @@
     DictionaryValue* dictionary = new DictionaryValue();
     dictionary->SetString("id", descriptor.id());
     dictionary->SetString("displayName", display_name);
 
     // One input method can be associated with multiple languages, hence
     // we use a dictionary here.
     DictionaryValue* languages = new DictionaryValue();
     for (size_t i = 0; i < descriptor.language_codes().size(); ++i) {
       languages->SetBoolean(descriptor.language_codes().at(i), true);
     }
-    // Check extra languages to see if there are languages associated with
-    // this input method. If these are present, add these.
-    const std::vector<std::string> extra_language_codes =
-        manager->GetInputMethodUtil()->GetExtraLanguageCodesFromId(
-            descriptor.id());
-    for (size_t j = 0; j < extra_language_codes.size(); ++j)
-      languages->SetBoolean(extra_language_codes[j], true);
     dictionary->Set("languageCodeSet", languages);
 
     input_method_list->Append(dictionary);
   }
 
   return input_method_list;
 }
 
 // static
 ListValue* CrosLanguageOptionsHandler::GetLanguageListInternal(
     const input_method::InputMethodDescriptors& descriptors,
     const std::vector<std::string>& base_language_codes) {
   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]);
   }
-  // Collect the language codes from extra languages.
-  const std::vector<std::string> extra_language_codes =
-      input_method::InputMethodManager::Get()->GetInputMethodUtil()
-          ->GetExtraLanguageCodeList();
-  for (size_t i = 0; i < extra_language_codes.size(); ++i)
-    language_codes.insert(extra_language_codes[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, string16> LanguagePair;
   typedef std::map<string16, LanguagePair> LanguageMap;
   LanguageMap language_map;
   // The auxiliary vector mentioned above.
   std::vector<string16> display_names;
@@ skipping 182 matching lines @@
       ConvertInputMethodDescriptosToIMEList(
           component_extension_manager->GetAllIMEAsInputMethodDescriptor()));
   web_ui()->CallJavascriptFunction(
       "options.LanguageOptions.onComponentManagerInitialized",
       *ime_list);
   composition_extension_appended_ = true;
 }
 
 }  // namespace options
 }  // namespace chromeos