Delete InputMethodEngine::CreateEngine and call the InputMethodEngineIBus contructor directly.

Remove unsued arguments from the constructor.

This doesn't change the actual behavior.

BUG=N/A

Review URL: https://codereview.chromium.org/90933002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238345 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/input_method/input_method_engine.cc

@@ -48,31 +48,4 @@ InputMethodEngine::CandidateWindowProperty::~CandidateWindowProperty() {
 
 InputMethodEngine::Observer::~Observer() {
 }
-
-InputMethodEngine* InputMethodEngine::CreateEngine(
-    InputMethodEngine::Observer* observer,
-    const char* engine_name,
-    const char* extension_id,
-    const char* engine_id,
-    const char* description,
-    const std::vector<std::string>& languages,
-    const std::vector<std::string>& layouts,
-    const GURL& options_page,
-    const GURL& input_view,
-    std::string* error) {
-
-  InputMethodEngineIBus* engine = new InputMethodEngineIBus();
-  engine->Initialize(observer,
-                     engine_name,
-                     extension_id,
-                     engine_id,
-                     description,
-                     languages,
-                     layouts,
-                     options_page,
-                     input_view,
-                     error);
-  return engine;
-}
-
 }  // namespace chromeos

chrome/browser/chromeos/input_method/input_method_engine.h

@@ -238,19 +238,6 @@ class InputMethodEngine {
                                      int offset,
                                      size_t number_of_chars,
                                      std::string* error) = 0;
-
-  // Create an IME engine.
-  static InputMethodEngine* CreateEngine(
-      InputMethodEngine::Observer* observer,
-      const char* engine_name,
-      const char* extension_id,
-      const char* engine_id,
-      const char* description,
-      const std::vector<std::string>& language,
-      const std::vector<std::string>& layouts,
-      const GURL& options_page,
-      const GURL& input_view,
-      std::string* error);
 };
 
 }  // namespace chromeos

chrome/browser/chromeos/input_method/input_method_engine_ibus.cc

@@ -86,12 +86,10 @@ void InputMethodEngineIBus::Initialize(
     const char* engine_name,
     const char* extension_id,
     const char* engine_id,
-    const char* description,
     const std::vector<std::string>& languages,
     const std::vector<std::string>& layouts,
     const GURL& options_page,
-    const GURL& input_view,
-    std::string* error) {
+    const GURL& input_view) {
   DCHECK(observer) << "Observer must not be null.";
 
   observer_ = observer;

chrome/browser/chromeos/input_method/input_method_engine_ibus.h

@@ -38,12 +38,10 @@ class InputMethodEngineIBus : public InputMethodEngine,
       const char* engine_name,
       const char* extension_id,
       const char* engine_id,
-      const char* description,
       const std::vector<std::string>& languages,
       const std::vector<std::string>& layouts,
       const GURL& options_page,
-      const GURL& input_view,
-      std::string* error);
+      const GURL& input_view);
 
   // InputMethodEngine overrides.
   virtual void StartIme() OVERRIDE;

chrome/browser/extensions/api/input_ime/OWNERS

+komatsu@chromium.org
+nona@chromium.org

chrome/browser/extensions/api/input_ime/input_ime_api.cc

@@ -7,7 +7,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/input_method/input_method_engine.h"
+#include "chrome/browser/chromeos/input_method/input_method_engine_ibus.h"
 #include "chrome/browser/extensions/extension_function_registry.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
@@ -296,7 +296,6 @@ bool InputImeEventRouter::RegisterIme(
   if (engine_ix != engine_map.end())
     return false;
 
-  std::string error;
   chromeos::ImeObserver* observer = new chromeos::ImeObserver(profile,
                                                               extension_id,
                                                               component.id);
@@ -306,18 +305,11 @@ bool InputImeEventRouter::RegisterIme(
   std::vector<std::string> languages;
   languages.assign(component.languages.begin(), component.languages.end());
 
-  chromeos::InputMethodEngine* engine =
-      chromeos::InputMethodEngine::CreateEngine(
-          observer, component.name.c_str(), extension_id.c_str(),
-          component.id.c_str(), component.description.c_str(),
-          languages, layouts, component.options_page_url,
-          component.input_view_url, &error);
-  if (!engine) {
-    delete observer;
-    LOG(ERROR) << "RegisterIme: " << error;
-    return false;
-  }
-
+  chromeos::InputMethodEngineIBus* engine =
+      new chromeos::InputMethodEngineIBus();
+  engine->Initialize(observer, component.name.c_str(), extension_id.c_str(),
+                     component.id.c_str(), languages, layouts,
+                     component.options_page_url, component.input_view_url);
   engine_map[component.id] = engine;
 
   std::map<std::string, chromeos::ImeObserver*>& observer_list =