Supporting multiple keyboard layouts.

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 344 matching lines @@
       // Returning |kDefaultLanguageCode| here is not for Chrome OS but for
       // Ubuntu where the ibus-xkb-layouts engine could be missing.
       kDefaultLanguageCode : iter->second;
 }
 
 std::string InputMethodUtil::GetKeyboardLayoutName(
     const std::string& input_method_id) const {
   InputMethodIdToDescriptorMap::const_iterator iter
       = id_to_descriptor_.find(input_method_id);
   return (iter == id_to_descriptor_.end()) ?
-      "" : iter->second.keyboard_layout();
+      "" : iter->second.GetPreferredKeyboardLayout();
 }
 
 std::string InputMethodUtil::GetInputMethodDisplayNameFromId(
     const std::string& input_method_id) const {
   string16 display_name;
   if (!extension_ime_util::IsExtensionIME(input_method_id) &&
       TranslateStringInternal(input_method_id, &display_name)) {
     return UTF16ToUTF8(display_name);
   }
   // Return an empty string if the display name is not found.
@@ skipping 174 matching lines @@
 
     // Check if there is one that matches the current keyboard layout, but
     // not the current keyboard itself. This is useful if there are
     // multiple keyboard layout choices for one input method. For
     // instance, Mozc provides three choices: mozc (US keyboard), mozc-jp
     // (JP keyboard), mozc-dv (Dvorak).
     const InputMethodDescriptor* descriptor =
         GetInputMethodDescriptorFromId(input_method_id);
     if (descriptor &&
         descriptor->id() != current_input_method.id() &&
-        descriptor->keyboard_layout() ==
-        current_input_method.keyboard_layout()) {
+        descriptor->GetPreferredKeyboardLayout() ==
+        current_input_method.GetPreferredKeyboardLayout()) {
       most_popular_id = input_method_id;
       break;
     }
   }
   // Add the most popular input method ID, if it's different from the
   // current input method.
   if (most_popular_id != current_input_method.id() &&
       // TODO(yusukes): Remove this hack when we remove the "english-m" IME.
       most_popular_id != "english-m") {
     out_input_method_ids->push_back(most_popular_id);
@@ skipping 41 matching lines @@
     const InputMethodDescriptor& input_method = imes.at(i);
     const std::string language_code = input_method.language_code();
     id_to_language_code_.insert(
         std::make_pair(input_method.id(), language_code));
     id_to_descriptor_.insert(
         std::make_pair(input_method.id(), input_method));
   }
 }
 
 InputMethodDescriptor InputMethodUtil::GetFallbackInputMethodDescriptor() {
+  std::vector<std::string> layouts;
+  layouts.push_back("us");
   return InputMethodDescriptor("xkb:us::eng",
                                "",
-                               "us",
+                               layouts,
                                "en-US",
                                "");  // options page, not available.
 }
 
 void InputMethodUtil::ReloadInternalMaps() {
   if (supported_input_methods_->size() <= 1) {
     DVLOG(1) << "GetSupportedInputMethods returned a fallback ID";
     // TODO(yusukes): Handle this error in nicer way.
   }
 
   // Clear the existing maps.
   language_code_to_ids_.clear();
   id_to_language_code_.clear();
   id_to_descriptor_.clear();
   xkb_id_to_descriptor_.clear();
 
   for (size_t i = 0; i < supported_input_methods_->size(); ++i) {
     const InputMethodDescriptor& input_method =
         supported_input_methods_->at(i);
     const std::string language_code = input_method.language_code();
     language_code_to_ids_.insert(
         std::make_pair(language_code, input_method.id()));
     // Remember the pairs.
     id_to_language_code_.insert(
         std::make_pair(input_method.id(), language_code));
     id_to_descriptor_.insert(
         std::make_pair(input_method.id(), input_method));
     if (IsKeyboardLayout(input_method.id())) {
       xkb_id_to_descriptor_.insert(
-          std::make_pair(input_method.keyboard_layout(), input_method));
+          std::make_pair(input_method.GetPreferredKeyboardLayout(),
+                         input_method));
     }
   }
 
   // Go through the languages listed in kExtraLanguages.
   for (size_t i = 0; i < kExtraLanguagesLength; ++i) {
     const char* language_code = kExtraLanguages[i].language_code;
     const char* input_method_id = kExtraLanguages[i].input_method_id;
     InputMethodIdToDescriptorMap::const_iterator iter =
         id_to_descriptor_.find(input_method_id);
     // If the associated input method descriptor is found, add the language
     // code and the input method.
     if (iter != id_to_descriptor_.end()) {
       const InputMethodDescriptor& input_method = iter->second;
       language_code_to_ids_.insert(
           std::make_pair(language_code, input_method.id()));
     }
   }
 }
 
 }  // namespace input_method
 }  // namespace chromeos