Supporting multiple keyboard layouts.

chromeos/ime/input_method_whitelist.cc

Index: chromeos/ime/input_method_whitelist.cc
diff --git a/chromeos/ime/input_method_whitelist.cc b/chromeos/ime/input_method_whitelist.cc
index d9a718c8abcb081b99c9238dbda958a9ee9a64a6..31a81b2934f34881224fb2df2e7c485873d14931 100644
--- a/chromeos/ime/input_method_whitelist.cc
+++ b/chromeos/ime/input_method_whitelist.cc
@@ -31,10 +31,13 @@ InputMethodWhitelist::GetSupportedInputMethods() const {
   scoped_ptr<InputMethodDescriptors> input_methods(new InputMethodDescriptors);
   input_methods->reserve(arraysize(kInputMethods));
   for (size_t i = 0; i < arraysize(kInputMethods); ++i) {
+    std::vector<std::string> layouts;
+    layouts.push_back(kInputMethods[i].xkb_layout_id);
+
     input_methods->push_back(InputMethodDescriptor(
         kInputMethods[i].input_method_id,
         "",
-        kInputMethods[i].xkb_layout_id,
+        layouts,
         kInputMethods[i].language_code,
         ""));  // options page url, not available for non-extension input
                // method.