Supporting multiple keyboard layouts.

chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc

Index: chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
diff --git a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
index 1ad55feeb3d43ccf8b01a4d3b9df2cdaa4e85c34..562705badd47a923dca19145e883178779272da2 100644
--- a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
+++ b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
@@ -140,7 +140,7 @@ bool ComponentExtensionIMEManagerImpl::IsInitialized() {
 // static
 bool ComponentExtensionIMEManagerImpl::ReadEngineComponent(
     const DictionaryValue& dict,
-    IBusComponent::EngineDescription* out) {
+    ComponentExtensionEngine* out) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
   DCHECK(out);
   std::string type;
@@ -159,9 +159,10 @@ bool ComponentExtensionIMEManagerImpl::ReadEngineComponent(
   if (!dict.GetList(extension_manifest_keys::kLayouts, &layouts))
     return false;
 
-  if (layouts->GetSize() > 0) {
-    if (!layouts->GetString(0, &out->layout))
-      return false;
+  for (size_t i = 0; i < layouts->GetSize(); ++i) {
+    std::string buffer;
+    if (layouts->GetString(i, &buffer))
+      out->layouts.push_back(buffer);
   }
   return true;
 }
@@ -228,7 +229,7 @@ void ComponentExtensionIMEManagerImpl::ReadComponentExtensionsInfo(
       if (!component_list->GetDictionary(i, &dictionary))
         continue;
 
-      IBusComponent::EngineDescription engine;
+      ComponentExtensionEngine engine;
       ReadEngineComponent(*dictionary, &engine);
       component_ime.engines.push_back(engine);
     }