Add sanity check for deprecated component extension IME.

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 330 matching lines @@
   if (!pending_input_method_.empty()) {
     ChangeInputMethod(pending_input_method_);
     pending_input_method_.clear();
   }
 
 }
 
 void InputMethodManagerImpl::LoadNecessaryComponentExtensions() {
   if (!component_extension_ime_manager_->IsInitialized())
     return;
-  for (size_t i = 0; i < active_input_method_ids_.size(); ++i) {
-    if (component_extension_ime_manager_->IsWhitelisted(
-        active_input_method_ids_[i])) {
+  // We have to do sanity check here, because some component extension IMEs may

[satorux1, 2013/04/15 08:31:32]

sanity check may be unclear. What about:

Load component extensions but also update |active_input_method_ids_| as some
component extension IMEs may have been removed from the Chrome OS image.

[Seigo Nonaka, 2013/04/16 07:17:03]

Sure thanks! Done.

+  // be removed. So if specified component extension IME is no longer existing,

[satorux1, 2013/04/15 08:31:32]

may be removed -> might have been removed from the Chrome OS image.

IME no longer exists

[Seigo Nonaka, 2013/04/16 07:17:03]

Done.

+  // falling back to existing IME.

[satorux1, 2013/04/15 08:31:32]

fall back to an existing IME.

[Seigo Nonaka, 2013/04/16 07:17:03]

Done.

+  std::vector<std::string> unfiltered_input_method_ids =
+      active_input_method_ids_;
+  active_input_method_ids_.clear();
+  for (size_t i = 0; i < unfiltered_input_method_ids.size(); ++i) {
+    if (!component_extension_ime_manager_->IsComponentExtensionIMEId(
+        unfiltered_input_method_ids[i])) {
+      // Legacy IMEs or xkb layouts are active alwayes.

[satorux1, 2013/04/15 08:31:32]

always active

[Seigo Nonaka, 2013/04/16 07:17:03]

Done.

+      active_input_method_ids_.push_back(unfiltered_input_method_ids[i]);
+    } else if (component_extension_ime_manager_->IsWhitelisted(
+        unfiltered_input_method_ids[i])) {
       component_extension_ime_manager_->LoadComponentExtensionIME(
-          active_input_method_ids_[i]);
+          unfiltered_input_method_ids[i]);
+      active_input_method_ids_.push_back(unfiltered_input_method_ids[i]);
     }
   }
 }
 
 void InputMethodManagerImpl::ActivateInputMethodProperty(
     const std::string& key) {
   DCHECK(!key.empty());
   ibus_controller_->ActivateInputMethodProperty(key);
 }
 
@@ skipping 414 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