Support comma separated hardware keyboard layout.

chromeos/ime/input_method_manager.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROMEOS_IME_INPUT_METHOD_MANAGER_H_
 #define CHROMEOS_IME_INPUT_METHOD_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 98 matching lines @@
   // If the given input method id is invalid, returns NULL.
   virtual const InputMethodDescriptor* GetInputMethodFromId(
       const std::string& input_method_id) const = 0;
 
   // Changes the current input method to |input_method_id|. If |input_method_id|
   // is not active, switch to the first one in the active input method list.
   virtual void ChangeInputMethod(const std::string& input_method_id) = 0;
 
   // Enables "login" keyboard layouts (e.g. US Qwerty, US Dvorak, French
   // Azerty) that are necessary for the |language_code| and then switches to
-  // |initial_layout| if the string is not empty. For example, if
+  // |initial_layouts| if the given list is not empty. For example, if
   // |language_code| is "en-US", US Qwerty, US International, US Extended, US
   // Dvorak, and US Colemak layouts would be enabled. Likewise, for Germany
   // locale, US Qwerty which corresponds to the hardware keyboard layout and
   // several keyboard layouts for Germany would be enabled.
-  //   Only layouts suitable for login screen are enabled.
-  virtual void EnableLoginLayouts(const std::string& language_code,
-                                  const std::string& initial_layout) = 0;
+  // Only layouts suitable for login screen are enabled.
+  virtual void EnableLoginLayouts(
+      const std::string& language_code,
+      const std::vector<std::string>& initial_layouts) = 0;
 
   // Activates the input method property specified by the |key|.
   virtual void ActivateInputMethodProperty(const std::string& key) = 0;
 
   // Updates the list of active input method IDs, and then starts or stops the
   // system input method framework as needed.
-  virtual bool EnableInputMethods(
+  virtual bool ReplaceEnabledInputMethods(
       const std::vector<std::string>& new_active_input_method_ids) = 0;
 
   // Adds one entry to the list of active input method IDs, and then starts or
   // stops the system input method framework as needed.
   virtual bool EnableInputMethod(
       const std::string& new_active_input_method_id) = 0;
 
   // Adds an input method extension. This function does not takes ownership of
   // |instance|.
   virtual void AddInputMethodExtension(
       const std::string& imm_id,
       InputMethodEngineInterface* instance) = 0;
 
   // Removes an input method extension.
   virtual void RemoveInputMethodExtension(const std::string& id) = 0;
 
   // Returns a list of descriptors for all Input Method Extensions.
   virtual void GetInputMethodExtensions(InputMethodDescriptors* result) = 0;
 
   // Sets the list of extension IME ids which should be enabled.
   virtual void SetEnabledExtensionImes(std::vector<std::string>* ids) = 0;
 
-  // Sets current input method to default (first owners, then hardware).
-  virtual void SetInputMethodDefault() = 0;
+  // Sets current input method to login default (first owners, then hardware).
+  virtual void SetInputMethodLoginDefault() = 0;
 
   // Gets the descriptor of the input method which is currently selected.
   virtual InputMethodDescriptor GetCurrentInputMethod() const = 0;
 
   // Gets the list of input method properties. The list could be empty().
   virtual InputMethodPropertyList GetCurrentInputMethodProperties() const = 0;
 
   // Sets the list of input method properties. The list could be empty().
   virtual void SetCurrentInputMethodProperties(
       const InputMethodPropertyList& property_list) = 0;
@@ skipping 20 matching lines @@
   virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) = 0;
 
   // If keyboard layout can be uset at login screen
   virtual bool IsLoginKeyboard(const std::string& layout) const = 0;
 };
 
 }  // namespace input_method
 }  // namespace chromeos
 
 #endif  // CHROMEOS_IME_INPUT_METHOD_MANAGER_H_