Support comma separated hardware keyboard layout.

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 50092b456a93b389ca348095a887ea885ef3cbd0..bc0f0621a608f2463cfe4b6b384b4a3ddfe3aa58 100644
--- a/chrome/browser/chromeos/input_method/input_method_util.h
+++ b/chrome/browser/chromeos/input_method/input_method_util.h
@@ -13,6 +13,7 @@
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
+#include "base/threading/thread_checker.h"
 #include "chromeos/ime/input_method_descriptor.h"
 
 namespace chromeos {
@@ -97,12 +98,18 @@ class InputMethodUtil {
   // Returns empty string on error.
   std::string GetLanguageDefaultInputMethodId(const std::string& language_code);
 
-  // Returns the input method ID of the hardware keyboard. e.g. "xkb:us::eng"
+  // Updates the internal cache of hardware layouts.
+  void UpdateHardwareLayoutCache();
+
+  // Set hardware keyboard layout for testing purpose.
+  void SetHardwareKeyboardLayoutForTesting(const std::string& layout);

[Hiro Komatsu, 2014/02/14 07:16:51]

If it's for simulating the VPD option, please mention so.

[Seigo Nonaka, 2014/02/14 08:13:22]

Done.

+
+  // Fills the input method IDs of the hardware keyboard. e.g. "xkb:us::eng"
   // for the US Qwerty keyboard.
-  std::string GetHardwareInputMethodId() const;
+  const std::vector<std::string>& GetHardwareInputMethodIds();
 
   // Returns the login-allowed input method ID of the hardware keyboard.

[Hiro Komatsu, 2014/02/14 07:16:51]

Would you comment what the difference from the above GetHardwareInputMethodIds,
especially example of IMEs which are not allowed and why.  Please also mention
whether the return values are subset of the above function's or not.

[Seigo Nonaka, 2014/02/14 08:13:22]

Done.

-  std::string GetHardwareLoginInputMethodId() const;
+  const std::vector<std::string>& GetHardwareLoginInputMethodIds();
 
   // Returns true if given input method can be used to input login data.
   bool IsLoginKeyboard(const std::string& input_method_id) const;
@@ -173,6 +180,10 @@ class InputMethodUtil {
 
   InputMethodDelegate* delegate_;
 
+  base::ThreadChecker thread_checker_;
+  std::vector<std::string> hardware_layouts_;
+  std::vector<std::string> hardware_login_layouts_;
+
   DISALLOW_COPY_AND_ASSIGN(InputMethodUtil);
 };