chromeos: Fix chromeos TODO in input_method_util.h

chrome/browser/chromeos/input_method/input_method_util.cc

 // Copyright (c) 2011 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/chromeos/input_method/input_method_util.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <utility>
@@ skipping 59 matching lines @@
       language_code_to_ids->insert(
           std::make_pair(language_code, input_method.id()));
       // Remember the pairs.
       id_to_language_code->insert(
           std::make_pair(input_method.id(), language_code));
       id_to_descriptor->insert(
           std::make_pair(input_method.id(), input_method));
     }
 
     // Go through the languages listed in kExtraLanguages.
-    for (size_t i = 0; i < arraysize(kExtraLanguages); ++i) {
+    for (size_t i = 0; i < kExtraLanguagesLength; ++i) {
       const char* language_code = kExtraLanguages[i].language_code;
       const char* input_method_id = kExtraLanguages[i].input_method_id;
       InputMethodIdToDescriptorMap::const_iterator iter =
           id_to_descriptor->find(input_method_id);
       // If the associated input method descriptor is found, add the
       // language code and the input method.
       if (iter != id_to_descriptor->end()) {
         const InputMethodDescriptor& input_method = iter->second;
         language_code_to_ids->insert(
             std::make_pair(language_code, input_method.id()));
@@ skipping 260 matching lines @@
     }
     *out_string = l10n_util::GetStringUTF16(iter2->second);
   } else {
     *out_string = l10n_util::GetStringUTF16(iter->second);
   }
   return true;
 };
 
 }  // namespace
 
+const ExtraLanguage kExtraLanguages[] = {
+  // Language Code  Input Method ID
+  { "en-AU",        "xkb:us::eng" },  // For Austrailia, use US keyboard layout.
+  { "id",           "xkb:us::eng" },  // For Indonesian, use US keyboard layout.
+  // The code "fil" comes from app/l10_util.cc.
+  { "fil",          "xkb:us::eng" },  // For Filipino, use US keyboard layout.
+  // For Netherlands, use US international keyboard layout.
+  { "nl",           "xkb:us:intl:eng" },
+  // The code "es-419" comes from app/l10_util.cc.
+  // For Spanish in Latin America, use Latin American keyboard layout.
+  { "es-419",       "xkb:latam::spa" },
+};
+const size_t kExtraLanguagesLength = arraysize(kExtraLanguages);
+
 std::wstring GetString(const std::string& english_string,
                        const std::string& input_method_id) {
   string16 localized_string;
   if (GetLocalizedString(english_string, input_method_id, &localized_string)) {
     return UTF16ToWide(localized_string);
   }
   return UTF8ToWide(english_string);
 }
 
 std::string GetStringUTF8(const std::string& english_string,
@@ skipping 364 matching lines @@
 void ReloadInternalMaps() {
   IdMaps::GetInstance()->ReloadMaps();
 }
 
 void OnLocaleChanged() {
   ReloadInternalMaps();
 }
 
 }  // namespace input_method
 }  // namespace chromeos