Delete IBusComponent.

chrome/browser/chromeos/input_method/input_method_engine_ibus.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_engine_ibus.h"
 
 #define XK_MISCELLANY
 #include <X11/keysymdef.h>
 #include <map>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/ibus/ibus_component.h"
 #include "chromeos/dbus/ibus/ibus_engine_factory_service.h"
 #include "chromeos/dbus/ibus/ibus_engine_service.h"
 #include "chromeos/dbus/ibus/ibus_text.h"
 #include "chromeos/ime/candidate_window.h"
 #include "chromeos/ime/component_extension_ime_manager.h"
 #include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/ibus_keymap.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "dbus/object_path.h"
 
@@ skipping 14 matching lines @@
 InputMethodEngineIBus::InputMethodEngineIBus()
     : focused_(false),
       active_(false),
       context_id_(0),
       next_context_id_(1),
       aux_text_(new IBusText()),
       aux_text_visible_(false),
       observer_(NULL),
       preedit_text_(new IBusText()),
       preedit_cursor_(0),
-      component_(new IBusComponent()),
       candidate_window_(new input_method::CandidateWindow()),
       window_visible_(false),
       ibus_engine_factory_service_(IBusEngineFactoryService::Create()),
       weak_ptr_factory_(this) {}
 
 InputMethodEngineIBus::~InputMethodEngineIBus() {
   input_method::InputMethodManager::Get()->RemoveInputMethodExtension(ibus_id_);
 
   // Do not unset engine before removing input method extension, above function
   // may call reset function of engine object.
@@ skipping 26 matching lines @@
   ComponentExtensionIMEManager* comp_ext_ime_manager
       = manager->GetComponentExtensionIMEManager();
 
   if (comp_ext_ime_manager->IsInitialized() &&
       comp_ext_ime_manager->IsWhitelistedExtension(extension_id)) {
     ibus_id_ = comp_ext_ime_manager->GetId(extension_id, engine_id);
   } else {
     ibus_id_ = extension_ime_util::GetInputMethodID(extension_id, engine_id);
   }
 
-  component_.reset(new IBusComponent());
-  component_->set_name(std::string(kEngineBusPrefix) + std::string(engine_id));
-  component_->set_description(description);
-  component_->set_author(engine_name);
-
-  // TODO(nona): Remove IBusComponent once ibus is gone.
-  IBusComponent::EngineDescription engine_desc;
-  engine_desc.engine_id = ibus_id_;
-  engine_desc.display_name = description;
-  engine_desc.description = description;
-  engine_desc.language_code = (languages.empty()) ? "" : languages[0];
-  engine_desc.author = ibus_id_;
-
-  component_->mutable_engine_description()->push_back(engine_desc);
   manager->AddInputMethodExtension(ibus_id_, engine_name, layouts, languages,
                                    options_page, input_view, this);
   RegisterComponent();
 }
 
 void InputMethodEngineIBus::StartIme() {
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
   if (manager && ibus_id_ == manager->GetCurrentInputMethod().id())
     Enable();
@@ skipping 483 matching lines @@
     const IBusEngineFactoryService::CreateEngineResponseSender& sender) {
   GetCurrentService()->UnsetEngine(this);
   ibus_engine_service_.reset();
   object_path_ = ibus_engine_factory_service_->GenerateUniqueObjectPath();
 
   GetCurrentService()->SetEngine(this);
   sender.Run(object_path_);
 }
 
 }  // namespace chromeos