Only strip 'keyboard' from the input method name for OOBE screen.

chrome/browser/chromeos/input_method/input_method_util.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_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_
 
 #include <cstddef>
 #include <map>
 #include <string>
@@ skipping 39 matching lines @@
   // Converts an input method ID to a display name of the IME. Returns
   // an empty strng when |input_method_id| is unknown.
   // Examples: "pinyin" => "Pinyin"
   std::string GetInputMethodDisplayNameFromId(
       const std::string& input_method_id) const;
 
   base::string16 GetInputMethodShortName(
       const InputMethodDescriptor& input_method) const;
   base::string16 GetInputMethodMediumName(
       const InputMethodDescriptor& input_method) const;
+  base::string16 GetInputMethodLongNameStripped(
+      const InputMethodDescriptor& input_method) const;
   base::string16 GetInputMethodLongName(
       const InputMethodDescriptor& input_method) const;
 
   // Converts an input method ID to an input method descriptor. Returns NULL
   // when |input_method_id| is unknown.
   // Example: "pinyin" => { id: "pinyin", display_name: "Pinyin",
   //                        keyboard_layout: "us", language_code: "zh" }
   const InputMethodDescriptor* GetInputMethodDescriptorFromId(
       const std::string& input_method_id) const;
 
@@ skipping 100 matching lines @@
   // "xkb:us::eng"       => "us"
   // "xkb:us:dvorak:eng" => "us(dvorak)"
   // "xkb:gb::eng"       => "gb"
   // "pinyin"            => "us" (because Pinyin uses US keyboard layout)
   std::string GetKeyboardLayoutName(const std::string& input_method_id) const;
 
  private:
   bool TranslateStringInternal(const std::string& english_string,
                                base::string16 *out_string) const;
 
+  // Get long name of the given input method. |strip| is to specify whether to
+  // strip the 'keyboard' from the long name, as some UI (e.g. OOBE) doesn't
+  // want it.
+  base::string16 GetInputMethodLongNameInternal(
+      const InputMethodDescriptor& input_method, bool strip) const;
+
   // Map from language code to associated input method IDs, etc.
   typedef std::multimap<std::string, std::string> LanguageCodeToIdsMap;
 
   LanguageCodeToIdsMap language_code_to_ids_;
   InputMethodIdToDescriptorMap id_to_descriptor_;
   std::map<std::string, std::string> xkb_layout_to_indicator_;
 
   typedef base::hash_map<std::string, int> HashType;
   HashType english_to_resource_id_;
 
   InputMethodDelegate* delegate_;
 
   base::ThreadChecker thread_checker_;
   std::vector<std::string> hardware_layouts_;
   std::vector<std::string> hardware_login_layouts_;
   std::vector<std::string> cached_hardware_layouts_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodUtil);
 };
 
 }  // namespace input_method
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_