Initialize IMF with a whitelist of input methods so that login screen doesn't need to wait for comp…

chrome/browser/chromeos/input_method/input_method_util.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/chromeos/input_method/input_method_util.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <utility>
@@ skipping 384 matching lines @@
     xkb_layout_to_indicator_[kXkbIndicators[i][0]] = kXkbIndicators[i][1];
   }
 }
 
 InputMethodUtil::~InputMethodUtil() {
 }
 
 bool InputMethodUtil::TranslateStringInternal(
     const std::string& english_string, base::string16 *out_string) const {
   DCHECK(out_string);
-  HashType::const_iterator iter = english_to_resource_id_.find(english_string);
+  // |english_string| could be an input method id. So legacy xkb id is required
+  // to get the translated string.
+  std::string key_string = extension_ime_util::MaybeGetLegacyXkbId(
+      english_string);
+  HashType::const_iterator iter = english_to_resource_id_.find(key_string);
+
   if (iter == english_to_resource_id_.end()) {
     // TODO(yusukes): Write Autotest which checks if all display names and all
     // property names for supported input methods are listed in the resource
     // ID array (crosbug.com/4572).
-    LOG(ERROR) << "Resource ID is not found for: " << english_string;
+    LOG(ERROR) << "Resource ID is not found for: " << key_string;
     return false;
   }
 
   *out_string = delegate_->GetLocalizedString(iter->second);
   return true;
 }
 
 base::string16 InputMethodUtil::TranslateString(
     const std::string& english_string) const {
   base::string16 localized_string;
@@ skipping 122 matching lines @@
   // Special case for German, French and Dutch: these languages have multiple
   // keyboard layouts and share the same layout of keyboard (Belgian). We need
   // to show explicitly the language for the layout. For Arabic, Amharic, and
   // Indic languages: they share "Standard Input Method".
   const base::string16 standard_input_method_text =
       delegate_->GetLocalizedString(
           IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_STANDARD_INPUT_METHOD);
   DCHECK(!input_method.language_codes().empty());
   const std::string language_code = input_method.language_codes().at(0);
 
-  // Before translate the string, convert the input method id to legacy xkb id
-  // if possible.
-  // TODO(shuchen): the GetInputMethodLongName() method should be removed when
-  // finish the wrapping of xkb to extension.
-  base::string16 text = TranslateString(
-      extension_ime_util::MaybeGetLegacyXkbId(input_method.id()));
+  base::string16 text = TranslateString(input_method.id());
   if (text == standard_input_method_text ||
              language_code == "de" ||
              language_code == "fr" ||
              language_code == "nl") {
     const base::string16 language_name = delegate_->GetDisplayLanguageName(
         language_code);
 
     text = language_name + base::UTF8ToUTF16(" - ") + text;
   }
 
@@ skipping 330 matching lines @@
           std::make_pair(language_codes[i], input_method_id));
       // Remember the pairs.
       id_to_language_code_.insert(
           std::make_pair(input_method_id, language_codes[i]));
     }
   }
 }
 
 }  // namespace input_method
 }  // namespace chromeos