Support comma separated hardware keyboard layout.

chrome/browser/chromeos/input_method/input_method_util.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 CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_
 
 #include <cstddef>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
+#include "base/threading/thread_checker.h"
 #include "chromeos/ime/input_method_descriptor.h"
 
 namespace chromeos {
 namespace input_method {
 
 class InputMethodDelegate;
 
 enum InputMethodType {
   kKeyboardLayoutsOnly,
   kAllInputMethods,
@@ skipping 64 matching lines @@
   // Gets the language codes associated with the given input method IDs.
   // The returned language codes won't have duplicates.
   void GetLanguageCodesFromInputMethodIds(
       const std::vector<std::string>& input_method_ids,
       std::vector<std::string>* out_language_codes) const;
 
   // Gets first input method associated with the language.
   // Returns empty string on error.
   std::string GetLanguageDefaultInputMethodId(const std::string& language_code);
 
-  // Returns the input method ID of the hardware keyboard. e.g. "xkb:us::eng"
-  // for the US Qwerty keyboard.
-  std::string GetHardwareInputMethodId() const;
+  // Fills the input method IDs of the hardware keyboard. e.g. "xkb:us::eng"
+  // for the US Qwerty keyboard. |out| must not be NULL.
+  const std::vector<std::string>& GetHardwareInputMethodIds();
 
   // Returns the login-allowed input method ID of the hardware keyboard.
-  std::string GetHardwareLoginInputMethodId() const;
+  const std::vector<std::string>& GetHardwareLoginInputMethodIds();
+
+  // Invalidates the internal cache of hardware keyboard layouts.
+  void InvalidateHardwareInputMethodIdsCache();
 
   // Returns true if given input method can be used to input login data.
   bool IsLoginKeyboard(const std::string& input_method_id) const;
 
   // Returns true if the given input method id is supported.
   bool IsValidInputMethodId(const std::string& input_method_id) const;
 
   // Returns true if the given input method id is for a keyboard layout.
   static bool IsKeyboardLayout(const std::string& input_method_id);
 
@@ skipping 50 matching lines @@
   std::map<std::string, std::string> id_to_language_code_;
   InputMethodIdToDescriptorMap id_to_descriptor_;
   XkbIdToDescriptorMap xkb_id_to_descriptor_;
   ComponentExtIMEMap component_extension_ime_id_to_descriptor_;
 
   typedef base::hash_map<std::string, int> HashType;
   HashType english_to_resource_id_;
 
   InputMethodDelegate* delegate_;
 
+  base::ThreadChecker thread_checker_;
+  scoped_ptr<std::vector<std::string> > hardware_layouts_;

[Alexander Alekseev, 2014/02/12 14:45:35]

Do not need scoped_ptr here.

[Seigo Nonaka, 2014/02/12 16:49:51]

Done.

+  scoped_ptr<std::vector<std::string> > hardware_login_layouts_;
+
   DISALLOW_COPY_AND_ASSIGN(InputMethodUtil);
 };
 
 }  // namespace input_method
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_