Supporting multiple keyboard layouts.

chrome/browser/chromeos/input_method/input_method_manager_impl.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_manager_impl.h"
 
 #include <algorithm>  // std::find
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 300 matching lines @@
       descriptor = &(i->second);
     }
     DCHECK(descriptor);
 
     previous_input_method_ = current_input_method_;
     current_input_method_ = *descriptor;
   }
 
   // Change the keyboard layout to a preferred layout for the input method.
   if (!xkeyboard_->SetCurrentKeyboardLayoutByName(
-          current_input_method_.keyboard_layout())) {
+          current_input_method_.GetPreferredKeyboardLayout())) {
     LOG(ERROR) << "Failed to change keyboard layout to "
-               << current_input_method_.keyboard_layout();
+               << current_input_method_.GetPreferredKeyboardLayout();
   }
 
   // Update input method indicators (e.g. "US", "DV") in Chrome windows.
   FOR_EACH_OBSERVER(InputMethodManager::Observer,
                     observers_,
                     InputMethodChanged(this, show_message));
 }
 
 void InputMethodManagerImpl::OnComponentExtensionInitialized(
     scoped_ptr<ComponentExtensionIMEManagerDelegate> delegate) {
@@ skipping 49 matching lines @@
     InputMethodEngine* engine) {
   if (state_ == STATE_TERMINATING)
     return;
 
   if (!extension_ime_util::IsExtensionIME(id) &&
       !ComponentExtensionIMEManager::IsComponentExtensionIMEId(id)) {
     DVLOG(1) << id << " is not a valid extension input method ID.";
     return;
   }
 
-  const std::string layout = layouts.empty() ? "" : layouts[0];
   // TODO(nona): Support options page for normal extension ime.
   //             crbug.com/156283.
   extra_input_methods_[id] =
-      InputMethodDescriptor(id, name, layout, language, "");
+      InputMethodDescriptor(id, name, layouts, language, "");
   if (!Contains(filtered_extension_imes_, id) &&
       !ComponentExtensionIMEManager::IsComponentExtensionIMEId(id)) {
     if (!Contains(active_input_method_ids_, id)) {
       active_input_method_ids_.push_back(id);
     } else {
       DVLOG(1) << "AddInputMethodExtension: alread added: "
                << id << ", " << name;
       // Call Start() anyway, just in case.
     }
 
@@ skipping 386 matching lines @@
   candidate_window_controller_.reset(
       CandidateWindowController::CreateCandidateWindowController());
   if (candidate_window_controller_->Init(ibus_controller_.get()))
     candidate_window_controller_->AddObserver(this);
   else
     DVLOG(1) << "Failed to initialize the candidate window controller";
 }
 
 }  // namespace input_method
 }  // namespace chromeos