Guest Mode: input method should default to the underlying latin 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>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/ime/component_extension_ime_manager.h"
 #include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/input_method_delegate.h"
+#include "chromeos/ime/input_method_manager.h"
 // TODO(nona): move this header from this file.
 #include "grit/generated_resources.h"
 
 namespace {
 
 // A mapping from an input method id to a string for the language indicator. The
 // mapping is necessary since some input methods belong to the same language.
 // For example, both "xkb:us::eng" and "xkb:us:dvorak:eng" are for US English.
 const struct {
   const char* input_method_id;
@@ skipping 565 matching lines @@
     DCHECK(!input_method->language_codes().empty());
     const std::string language_code = input_method->language_codes().at(0);
     // Add it if it's not already present.
     if (std::count(out_language_codes->begin(), out_language_codes->end(),
                    language_code) == 0) {
       out_language_codes->push_back(language_code);
     }
   }
 }
 
+std::string InputMethodUtil::GetLanguageDefaultInputMethodId(
+    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();
 
   if (input_method_id.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();
   }
   return input_method_id;
 }
 
+std::string InputMethodUtil::GetHardwareLoginInputMethodId() const {
+  const std::string input_method_id = GetHardwareInputMethodId();
+
+  if (!InputMethodManager::Get()->IsLoginKeyboard(input_method_id)) {

[Hiro Komatsu, 2014/01/21 05:46:01]

Please check the actual implementation of IsLogingKeyboard.  You do not need to
include input_method_manager.h.

[Alexander Alekseev, 2014/01/21 14:05:27]

Done.

+    return GetFallbackInputMethodDescriptor().id();
+  }
+
+  return input_method_id;
+}
+
 void InputMethodUtil::SetComponentExtensions(
     const InputMethodDescriptors& imes) {
   component_extension_ime_id_to_descriptor_.clear();
   for (size_t i = 0; i < imes.size(); ++i) {
     const InputMethodDescriptor& input_method = imes.at(i);
     DCHECK(!input_method.language_codes().empty());
     const std::string language_code = input_method.language_codes().at(0);
     id_to_language_code_.insert(
         std::make_pair(input_method.id(), language_code));
     id_to_descriptor_.insert(
@@ skipping 44 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