Add the ability to filter out extension IMEs from the language settings page.

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/memory/scoped_ptr.h"
@@ skipping 298 matching lines @@
     return;
 
   if (!InputMethodUtil::IsExtensionInputMethod(id)) {
     DVLOG(1) << id << " is not a valid extension input method ID.";
     return;
   }
 
   const std::string layout = layouts.empty() ? "" : layouts[0];
   extra_input_methods_[id] =
       InputMethodDescriptor(id, name, layout, language, true);
+  if (!Contains(filtered_extension_imes_, 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.
+    }
 
-  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.
+    // Ensure that the input method daemon is running.
+    MaybeInitializeCandidateWindowController();
+    ibus_controller_->Start();
   }
 
-  // Ensure that the input method daemon is running.
-  MaybeInitializeCandidateWindowController();
-  ibus_controller_->Start();
-
   extra_input_method_instances_[id] =
       static_cast<InputMethodEngineIBus*>(engine);
 }
 
 void InputMethodManagerImpl::RemoveInputMethodExtension(const std::string& id) {
   if (!InputMethodUtil::IsExtensionInputMethod(id))
     DVLOG(1) << id << " is not a valid extension input method ID.";
 
   std::vector<std::string>::iterator i = std::find(
       active_input_method_ids_.begin(), active_input_method_ids_.end(), id);
@@ skipping 16 matching lines @@
       extra_input_method_instances_.find(id);
   if (ite == extra_input_method_instances_.end()) {
     DVLOG(1) << "The engine instance of " << id << " has already gone.";
   } else {
     // Do NOT release the actual instance here. This class does not take an
     // onwership of engine instance.
     extra_input_method_instances_.erase(ite);
   }
 }
 
+InputMethodDescriptors* InputMethodManagerImpl::GetInputMethodExtensions() {
+  InputMethodDescriptors* result = new InputMethodDescriptors;

[Seigo Nonaka, 2012/09/12 16:50:37]

Caller takes ownership of returned value?
Please leave document in function comment or how about passing
InputMethodDescriptors pointer instead?

[Zachary Kuznia, 2012/09/13 09:28:32]

Done.

+  // Build the extension input method descriptors from the extra input
+  // methods cache |extra_input_methods_|.
+  std::map<std::string, InputMethodDescriptor>::iterator iter;
+  for (iter = extra_input_methods_.begin(); iter != extra_input_methods_.end();
+       ++iter) {
+    result->push_back(iter->second);
+  }
+  return result;
+}
+
+void InputMethodManagerImpl::SetFilteredExtensionImes(
+    std::vector<std::string>& ids) {
+
+  filtered_extension_imes_.insert(filtered_extension_imes_.end(),
+                                  ids.begin(),
+                                  ids.end());
+
+  bool active_imes_changed = false;
+
+  for (std::map<std::string, InputMethodDescriptor>::iterator extra_iter =
+       extra_input_methods_.begin(); extra_iter != extra_input_methods_.end();
+       ++extra_iter) {
+    std::vector<std::string>::iterator active_iter = std::find(
+        active_input_method_ids_.begin(), active_input_method_ids_.end(),
+        extra_iter->first);
+
+    bool active = active_iter != active_input_method_ids_.end();
+    bool filtered = Contains(filtered_extension_imes_, extra_iter->first);
+
+    if (active && filtered)
+      active_input_method_ids_.erase(active_iter);
+
+    if (!active && !filtered)
+      active_input_method_ids_.push_back(extra_iter->first);
+
+    if (active == filtered)
+      active_imes_changed = true;
+  }
+
+  if (active_imes_changed) {
+    MaybeInitializeCandidateWindowController();
+    ibus_controller_->Start();
+
+    // If |current_input_method| is no longer in |active_input_method_ids_|,
+    // switch to the first one in |active_input_method_ids_|.
+    ChangeInputMethod(current_input_method_.id());
+  }
+}
+
 bool InputMethodManagerImpl::SwitchToNextInputMethod() {
   // Sanity checks.
   if (active_input_method_ids_.empty()) {
     DVLOG(1) << "active input method is empty";
     return false;
   }
   if (current_input_method_.id().empty()) {
     DVLOG(1) << "current_input_method_ is unknown";
     return false;
   }
@@ skipping 118 matching lines @@
 
 InputMethodUtil* InputMethodManagerImpl::GetInputMethodUtil() {
   return &util_;
 }
 
 void InputMethodManagerImpl::OnConnected() {
   for (std::map<std::string, InputMethodEngineIBus*>::iterator ite =
           extra_input_method_instances_.begin();
        ite != extra_input_method_instances_.end();
        ite++) {
-    ite->second->OnConnected();
+    if (!Contains(filtered_extension_imes_, ite->first))
+      ite->second->OnConnected();
   }
 }
 
 void InputMethodManagerImpl::OnDisconnected() {
   for (std::map<std::string, InputMethodEngineIBus*>::iterator ite =
           extra_input_method_instances_.begin();
        ite != extra_input_method_instances_.end();
        ite++) {
-    ite->second->OnDisconnected();
+    if (!Contains(filtered_extension_imes_, ite->first))
+      ite->second->OnDisconnected();
   }
 }
 
 void InputMethodManagerImpl::Init() {
   DCHECK(!ibus_controller_.get());
 
   browser_state_monitor_.reset(new BrowserStateMonitor(this));
   ibus_controller_.reset(IBusController::Create());
   xkeyboard_.reset(XKeyboard::Create(util_));
   ibus_controller_->AddObserver(this);
@@ skipping 96 matching lines @@
     DVLOG(1) << "Failed to initialize the candidate window controller";
 }
 
 // static
 InputMethodManagerImpl* InputMethodManagerImpl::GetInstanceForTesting() {
   return new InputMethodManagerImpl;
 }
 
 }  // namespace input_method
 }  // namespace chromeos