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

chromeos/ime/component_extension_ime_manager.cc

 // Copyright 2013 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 "chromeos/ime/component_extension_ime_manager.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "chromeos/ime/extension_ime_util.h"
 
@@ skipping 72 matching lines @@
 }
 
 ComponentExtensionIMEManager::~ComponentExtensionIMEManager() {
 }
 
 void ComponentExtensionIMEManager::Initialize(
     scoped_ptr<ComponentExtensionIMEManagerDelegate> delegate) {
   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() {
   return is_initialized_;
 }
 
 bool ComponentExtensionIMEManager::LoadComponentExtensionIME(
     const std::string& input_method_id) {
   ComponentExtensionIME ime;
   if (FindEngineEntry(input_method_id, &ime, NULL))
@@ skipping 92 matching lines @@
               // Enables extension based xkb keyboards on login screen.
               extension_ime_util::IsKeyboardLayoutExtension(
                   input_method_id) && IsInLoginLayoutWhitelist(layouts),
               component_extension_imes_[i].options_page_url,
               component_extension_imes_[i].input_view_url));
     }
   }
   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);
 }
 
 void ComponentExtensionIMEManager::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 bool ComponentExtensionIMEManager::FindEngineEntry(
     const std::string& input_method_id,
@@ skipping 26 matching lines @@
 bool ComponentExtensionIMEManager::IsInLoginLayoutWhitelist(
     const std::vector<std::string>& layouts) {
   for (size_t i = 0; i < layouts.size(); ++i) {
     if (login_layout_set_.find(layouts[i]) != login_layout_set_.end())
       return true;
   }
   return false;
 }
 
 }  // namespace chromeos