Adds whitelisted non-extension-based input methods if no component extensions are at present (e.g. …

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 92 matching lines @@
     case STATE_TERMINATING: {
       if (candidate_window_controller_.get())
         candidate_window_controller_.reset();
       break;
     }
   }
 }
 
 scoped_ptr<InputMethodDescriptors>
 InputMethodManagerImpl::GetSupportedInputMethods() const {
-  scoped_ptr<InputMethodDescriptors> whitelist_imes =
-      whitelist_.GetSupportedInputMethods();
-  if (!component_extension_ime_manager_->IsInitialized())
-    return whitelist_imes.Pass();
+  if (!IsXkbComponentExtensionAvailable())
+    return whitelist_.GetSupportedInputMethods().Pass();
   return scoped_ptr<InputMethodDescriptors>(new InputMethodDescriptors).Pass();
 }
 
 scoped_ptr<InputMethodDescriptors>
 InputMethodManagerImpl::GetActiveInputMethods() const {
   scoped_ptr<InputMethodDescriptors> result(new InputMethodDescriptors);
   // Build the active input method descriptors from the active input
   // methods cache |active_input_method_ids_|.
   for (size_t i = 0; i < active_input_method_ids_.size(); ++i) {
     const std::string& input_method_id = active_input_method_ids_[i];
@@ skipping 191 matching lines @@
     DCHECK(!input_methods->empty());
     input_method_id_to_switch = input_methods->at(0).id();
     if (!input_method_id.empty()) {
       DVLOG(1) << "Can't change the current input method to "
                << input_method_id << " since the engine is not enabled. "
                << "Switch to " << input_method_id_to_switch << " instead.";
     }
   }
 
   if (!component_extension_ime_manager_->IsInitialized() &&
-      (!InputMethodUtil::IsKeyboardLayout(input_method_id_to_switch) ||
-       extension_ime_util::IsKeyboardLayoutExtension(
-           input_method_id_to_switch))) {
+      !InputMethodUtil::IsKeyboardLayout(input_method_id_to_switch)) {
     // We can't change input method before the initialization of
     // component extension ime manager.  ChangeInputMethod will be
     // called with |pending_input_method_| when the initialization is
     // done.
     pending_input_method_ = input_method_id_to_switch;
     return false;
   }
   pending_input_method_.clear();
 
   // Hide candidate window and info list.
@@ skipping 57 matching lines @@
                << 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;
 }
 
+bool InputMethodManagerImpl::IsXkbComponentExtensionAvailable() const {
+  if (!component_extension_ime_manager_->IsInitialized())
+    return false;
+  InputMethodDescriptors imes =
+      component_extension_ime_manager_->GetAllIMEAsInputMethodDescriptor();
+  for (size_t i = 0; i < imes.size(); ++i) {
+    if (StartsWithASCII(imes[i].id(), "xkb:", true))
+      return true;
+  }
+  return false;
+}
+
 void InputMethodManagerImpl::OnComponentExtensionInitialized(
     scoped_ptr<ComponentExtensionIMEManagerDelegate> delegate) {
   DCHECK(thread_checker_.CalledOnValidThread());
   component_extension_ime_manager_->Initialize(delegate.Pass());
   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)
+  if (IsXkbComponentExtensionAvailable())
     util_.ResetInputMethods(imes);
   else
     util_.AppendInputMethods(imes);
 
   LoadNecessaryComponentExtensions();
 
   if (!pending_input_method_.empty())
     ChangeInputMethodInternal(pending_input_method_, false);
 }
 
@@ skipping 433 matching lines @@
       CandidateWindowController::CreateCandidateWindowController());
   candidate_window_controller_->AddObserver(this);
 }
 
 Profile* InputMethodManagerImpl::GetProfile() const {
   return ProfileManager::GetActiveUserProfile();
 }
 
 }  // namespace input_method
 }  // namespace chromeos