Supporting multiple keyboard layouts.

chromeos/ime/input_method_descriptor.cc

Index: chromeos/ime/input_method_descriptor.cc
diff --git a/chromeos/ime/input_method_descriptor.cc b/chromeos/ime/input_method_descriptor.cc
index 3215b681e14cec89160a94fbdb1d065f55820938..9ceab2e1b3d36f1c103f8ba688d1d972177eec80 100644
--- a/chromeos/ime/input_method_descriptor.cc
+++ b/chromeos/ime/input_method_descriptor.cc
@@ -15,16 +15,22 @@ namespace input_method {
 InputMethodDescriptor::InputMethodDescriptor(
     const std::string& id,
     const std::string& name,
-    const std::string& keyboard_layout,
+    const std::vector<std::string>& keyboard_layouts,
     const std::string& language_code,
     const std::string& options_page_url)
     : id_(id),
       name_(name),
-      keyboard_layout_(keyboard_layout),
+      keyboard_layouts_(keyboard_layouts),
       language_code_(language_code),
       options_page_url_(options_page_url) {
 }
 
+std::string InputMethodDescriptor::GetPreferredKeyboardLayout() const {
+  // TODO(nona): Investigate better way to guess the preferred layout
+  //             http://crbug.com/170601.
+  return keyboard_layouts_.empty() ? "us" : keyboard_layouts_[0];
+}
+
 InputMethodDescriptor::InputMethodDescriptor() {
 }