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

chrome/browser/chromeos/input_method/input_method_util.h

Index: chrome/browser/chromeos/input_method/input_method_util.h
diff --git a/chrome/browser/chromeos/input_method/input_method_util.h b/chrome/browser/chromeos/input_method/input_method_util.h
index 36ba5aba16feab95b22dc6f502abcb2d91ffb4b8..fc7750928962a2c0147b4e59e1575bcc997dda15 100644
--- a/chrome/browser/chromeos/input_method/input_method_util.h
+++ b/chrome/browser/chromeos/input_method/input_method_util.h
@@ -57,6 +57,8 @@ class InputMethodUtil {
       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;
 
@@ -177,6 +179,12 @@ class InputMethodUtil {
   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;

[Seigo Nonaka, 2014/09/30 02:42:08]

What happens in the case of non US locale?
For example, "美式键盘" would be "美式" in the case of Chinese?

[Shu Chen, 2014/09/30 02:50:43]

That depends on how the translator translates "US" in such context.
In OOBE case, the Chinese translator translates "US" to "美国英语".

[Seigo Nonaka, 2014/09/30 03:08:52]

Ah, I misunderstand. The real behavior is using translated input method id. I
misunderstand it drops the 'keyboard' word from input method name.
I think |strip| sounds like removing some strings, how about renaming the
argument as |for_oobe| or |for_shorter_space|?

[Shu Chen, 2014/09/30 03:18:56]

Done.

+
   // Map from language code to associated input method IDs, etc.
   typedef std::multimap<std::string, std::string> LanguageCodeToIdsMap;