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..9cfb1ad785053cc00d85bcd90d64d0ef5930df70 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. |for_oobe| is to specify whether
+  // to get the long name for OOBE screen, because OOBE screen displays shorter
+  // name (e.g. 'US' instead of 'US keyboard').
+  base::string16 GetInputMethodLongNameInternal(
+      const InputMethodDescriptor& input_method, bool for_oobe) const;

[Nikita (slow), 2014/09/30 07:07:01]

nit: I would suggest renaming for_oobe to short_name.

[Shu Chen, 2014/09/30 07:11:02]

Done.

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