chrome/browser/chromeos/input_method/ refactoring [part 6 of 6]

chrome/browser/chromeos/input_method/input_method_engine.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.h"
 
 #include <map>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 36 matching lines @@
 
 class InputMethodEngineImpl
     : public InputMethodEngine,
       public input_method::IBusEngineController::Observer {
  public:
   InputMethodEngineImpl()
       : observer_(NULL), active_(false), next_context_id_(1),
         context_id_(-1) {}
 
   ~InputMethodEngineImpl() {
-    input_method::InputMethodManager::GetInstance()->RemoveActiveIme(ibus_id_);
+    input_method::InputMethodManager* manager =
+        input_method::InputMethodManager::GetInstance();
+    manager->RemoveInputMethodExtension(ibus_id_);
   }
 
   bool Init(InputMethodEngine::Observer* observer,
             const char* engine_name,
             const char* extension_id,
             const char* engine_id,
             const char* description,
             const char* language,
             const std::vector<std::string>& layouts,
             std::string* error);
@@ skipping 104 matching lines @@
                                                                description,
                                                                language,
                                                                layout.c_str()));
   if (!connection_.get()) {
     *error = "ConnectInputMethodExtension() failed.";
     return false;
   }
 
   observer_ = observer;
   engine_id_ = engine_id;
-  manager->AddActiveIme(ibus_id_, engine_name, layouts, language);
+  manager->AddInputMethodExtension(ibus_id_, engine_name, layouts, language);
   return true;
 }
 
 bool InputMethodEngineImpl::SetComposition(
     int context_id,
     const char* text,
     int selection_start,
     int selection_end,
     int cursor,
     const std::vector<SegmentInfo>& segments,
@@ skipping 461 matching lines @@
                         description, language, layouts, error)) {
     LOG(ERROR) << "Init() failed.";
     delete new_engine;
     new_engine = NULL;
   }
 
   return new_engine;
 }
 
 }  // namespace chromeos