Support comma separated hardware keyboard layout.

chrome/browser/chromeos/input_method/input_method_util.cc

 // 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.
 
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <utility>
@@ skipping 596 matching lines @@
     const std::string& language_code) {
   std::vector<std::string> candidates;
   GetInputMethodIdsFromLanguageCode(
       language_code, input_method::kKeyboardLayoutsOnly, &candidates);
   if (candidates.size())
     return candidates.front();
 
   return std::string();
 }
 
-std::string InputMethodUtil::GetHardwareInputMethodId() const {
-  const std::string input_method_id = delegate_->GetHardwareKeyboardLayout();
+const std::vector<std::string>&
+    InputMethodUtil::GetHardwareInputMethodIds() {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  if (hardware_layouts_.get())

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

Why are hardware_layouts_ and hardware_login_layouts_ are not automatically
constructed when delegate is created? So you would not need to store them in
scoped_ptr<>.

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

Yes, you are right! Changing to plain object.

On 2014/02/12 14:45:35, alemate wrote:

+    return *(hardware_layouts_.get());
 
-  if (input_method_id.empty()) {
+  hardware_layouts_.reset(new std::vector<std::string>());
+
+  delegate_->GetHardwareKeyboardLayouts(hardware_layouts_.get());
+
+  if (hardware_layouts_->empty()) {
     // This is totally fine if it's empty. The hardware keyboard layout is
     // not stored if startup_manifest.json (OEM customization data) is not
     // present (ex. Cr48 doen't have that file).
-    return GetFallbackInputMethodDescriptor().id();
+    hardware_layouts_->push_back(GetFallbackInputMethodDescriptor().id());
   }
-  return input_method_id;
+  return *(hardware_layouts_.get());
 }
 
-std::string InputMethodUtil::GetHardwareLoginInputMethodId() const {
-  const std::string input_method_id = GetHardwareInputMethodId();
+void InputMethodUtil::InvalidateHardwareInputMethodIdsCache() {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  hardware_layouts_.reset();
+  hardware_login_layouts_.reset();
+}
 
-  if (!IsLoginKeyboard(input_method_id))
-    return GetFallbackInputMethodDescriptor().id();
+const std::vector<std::string>&
+    InputMethodUtil::GetHardwareLoginInputMethodIds() {
+  DCHECK(thread_checker_.CalledOnValidThread());
 
-  return input_method_id;
+  if (hardware_login_layouts_.get())
+    return *(hardware_login_layouts_.get());
+
+  hardware_login_layouts_.reset(new std::vector<std::string>());
+  const std::vector<std::string>& candidates = GetHardwareInputMethodIds();
+
+  for (size_t i = 0; i < candidates.size(); ++i) {
+    if (IsLoginKeyboard(candidates[i]))
+      hardware_login_layouts_->push_back(candidates[i]);
+  }
+
+  if (hardware_login_layouts_->empty())
+    hardware_login_layouts_->push_back(GetFallbackInputMethodDescriptor().id());
+  return *(hardware_login_layouts_.get());
 }
 
 bool InputMethodUtil::IsLoginKeyboard(const std::string& input_method_id)
     const {
   const InputMethodDescriptor* ime =
       GetInputMethodDescriptorFromId(input_method_id);
   return ime ? ime->is_login_keyboard() : false;
 }
 
 void InputMethodUtil::SetComponentExtensions(
@@ skipping 53 matching lines @@
     if (IsKeyboardLayout(input_method.id())) {
       xkb_id_to_descriptor_.insert(
           std::make_pair(input_method.GetPreferredKeyboardLayout(),
                          input_method));
     }
   }
 }
 
 }  // namespace input_method
 }  // namespace chromeos