Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(357)

Unified Diff: chrome/browser/extensions/api/input_ime/input_ime_api.cc

Issue 90933002: Delete InputMethodEngine::CreateEngine and call the InputMethodEngineIBus contructor directly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add OWNER file Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/api/input_ime/OWNERS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/input_ime/input_ime_api.cc
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.cc b/chrome/browser/extensions/api/input_ime/input_ime_api.cc
index 3690b260d8011a159feb39ab4d0c6ea05cdd63c1..c719b363008278dc08463b48210c3e7a0f129a8c 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api.cc
+++ b/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 =
« no previous file with comments | « chrome/browser/extensions/api/input_ime/OWNERS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698