Supporting multiple keyboard layouts.

chromeos/ime/input_method_descriptor.h

Index: chromeos/ime/input_method_descriptor.h
diff --git a/chromeos/ime/input_method_descriptor.h b/chromeos/ime/input_method_descriptor.h
index 29f4f027c1da9dcd7a9fa3473240c77fecf4e28f..fd0c27dd0ef40c7c37d685988e705b030faf3d44 100644
--- a/chromeos/ime/input_method_descriptor.h
+++ b/chromeos/ime/input_method_descriptor.h
@@ -14,37 +14,45 @@
 namespace chromeos {
 namespace input_method {
 
-class InputMethodWhitelist;
-
 // A structure which represents an input method.
 class CHROMEOS_EXPORT InputMethodDescriptor {
  public:
   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);
   ~InputMethodDescriptor();
 
+  // Accessors
   const std::string& id() const { return id_; }
   const std::string& name() const { return name_; }
-  const std::string& keyboard_layout() const { return keyboard_layout_; }
   const std::string& language_code() const { return language_code_; }
   const std::string& options_page_url() const { return options_page_url_; }
+  const std::vector<std::string>& keyboard_layouts() const {
+    return keyboard_layouts_;
+  }
+
+  // Returns preferred keyboard layout.
+  std::string GetPreferredKeyboardLayout() const;
 
  private:
   // An ID that identifies an input method engine (e.g., "t:latn-post",
   // "pinyin", "hangul").
   std::string id_;
+
   // A name used to specify the user-visible name of this input method.  It is
   // only used by extension IMEs, and should be blank for internal IMEs.
   std::string name_;
+
   // A preferred physical keyboard layout for the input method (e.g., "us",
   // "us(dvorak)", "jp"). Comma separated layout names do NOT appear.
-  std::string keyboard_layout_;
+  std::vector<std::string> keyboard_layouts_;
+
   // Language code like "ko", "ja", "en-US", and "zh-CN".
   std::string language_code_;
+
   // Options page URL e.g.
   // "chrome-extension://ceaajjmckiakobniehbjpdcidfpohlin/options.html".
   // We can't use GURL here due to dependency policy. This field is valid only