Updates the whitelisted XKB input method IDs to sync up with the component XKB extension.

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 "ash/ime/input_method_menu_item.h"
 #include "ash/ime/input_method_menu_manager.h"
@@ skipping 368 matching lines @@
             empty_menu_item_list);
 
     const InputMethodDescriptor* descriptor = NULL;
     if (extension_ime_util::IsExtensionIME(input_method_id_to_switch)) {
       DCHECK(extra_input_methods_.find(input_method_id_to_switch) !=
              extra_input_methods_.end());
       descriptor = &(extra_input_methods_[input_method_id_to_switch]);
     } else {
       descriptor =
           util_.GetInputMethodDescriptorFromId(input_method_id_to_switch);
+      if (!descriptor)
+        LOG(ERROR) << "Unknown input method id: " << input_method_id_to_switch;
     }
     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 (!keyboard_->SetCurrentKeyboardLayoutByName(
           current_input_method_.GetPreferredKeyboardLayout())) {
     LOG(ERROR) << "Failed to change keyboard layout to "
                << 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));
   return true;
 }
 
 void InputMethodManagerImpl::OnComponentExtensionInitialized(
     scoped_ptr<ComponentExtensionIMEManagerDelegate> delegate) {
   DCHECK(thread_checker_.CalledOnValidThread());
   component_extension_ime_manager_->Initialize(delegate.Pass());
-  util_.SetComponentExtensions(
-      component_extension_ime_manager_->GetAllIMEAsInputMethodDescriptor());
+  InputMethodDescriptors imes =
+      component_extension_ime_manager_->GetAllIMEAsInputMethodDescriptor();
+  // In case of XKB extension is not available (e.g. linux_chromeos), don't
+  // reset the input methods in InputMethodUtil, Instead append input methods.
+  bool xkb_found = false;
+  for (size_t i = 0; i < imes.size(); ++i) {
+    if (StartsWithASCII(imes[i].id(), "xkb:", true)) {
+      xkb_found = true;
+      break;
+    }
+  }
+  if (xkb_found)
+    util_.ResetInputMethods(imes);
+  else
+    util_.AppendInputMethods(imes);
 
   LoadNecessaryComponentExtensions();
 
   if (!pending_input_method_.empty())
     ChangeInputMethodInternal(pending_input_method_, false);
 }
 
 void InputMethodManagerImpl::LoadNecessaryComponentExtensions() {
   if (!component_extension_ime_manager_->IsInitialized())
     return;
@@ skipping 428 matching lines @@
       CandidateWindowController::CreateCandidateWindowController());
   candidate_window_controller_->AddObserver(this);
 }
 
 Profile* InputMethodManagerImpl::GetProfile() const {
   return ProfileManager::GetActiveUserProfile();
 }
 
 }  // namespace input_method
 }  // namespace chromeos