[IME] Removes the duplicated IMEs in chrome://settings/languages, and support async component IMEs …

chromeos/ime/component_extension_ime_manager.cc

Index: chromeos/ime/component_extension_ime_manager.cc
diff --git a/chromeos/ime/component_extension_ime_manager.cc b/chromeos/ime/component_extension_ime_manager.cc
index 3037326346bc5fd82b4e6b8e86efcae556505206..619cc811481ce4269c4c6288d1cf1d261eb3de57 100644
--- a/chromeos/ime/component_extension_ime_manager.cc
+++ b/chromeos/ime/component_extension_ime_manager.cc
@@ -90,7 +90,12 @@ void ComponentExtensionIMEManager::Initialize(
   delegate_ = delegate.Pass();
   component_extension_imes_ = delegate_->ListIME();
   is_initialized_ = true;
-  FOR_EACH_OBSERVER(Observer, observers_, OnInitialized());
+}
+
+void ComponentExtensionIMEManager::NotifyInitialized() {
+  if (is_initialized_) {
+    FOR_EACH_OBSERVER(Observer, observers_, OnInitialized());

[Seigo Nonaka, 2014/03/07 07:21:21]

Why NotifyInitialized function is needed?
It is natural for me to call this in Initialize function.

[Shu Chen, 2014/03/07 07:30:29]

Please refer to line 419 of input_method_manager_impl.cc.
It needs to make sure the observers to handle OnInitialized() and can get the
input method descriptors from InputMethodUtil.

+  }
 }
 
 bool ComponentExtensionIMEManager::IsInitialized() {
@@ -203,6 +208,18 @@ input_method::InputMethodDescriptors
   return result;
 }
 
+input_method::InputMethodDescriptors
+    ComponentExtensionIMEManager::GetXkbIMEAsInputMethodDescriptor() {
+  input_method::InputMethodDescriptors result;
+  input_method::InputMethodDescriptors descriptors =

[Yuki, 2014/03/07 07:47:04]

Make this a const reference.  It's a good practice in general.  (Although no
effect in this case.)

[Shu Chen, 2014/03/07 08:24:09]

Done.

+      GetAllIMEAsInputMethodDescriptor();
+  for (size_t i = 0; i < descriptors.size(); ++i) {
+    if (extension_ime_util::IsKeyboardLayoutExtension(descriptors[i].id()))
+      result.push_back(descriptors[i]);
+  }
+  return result;
+}
+
 void ComponentExtensionIMEManager::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }