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 5003245b0bfaca3f9dbb2bfd756eeb45167a11f2..a7b0fdfcf80fc8fb411755cda32399944ed0ddcf 100644 |
--- a/chrome/browser/extensions/api/input_ime/input_ime_api.cc |
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api.cc |
@@ -6,6 +6,7 @@ |
#include "base/strings/string_number_conversions.h" |
#include "base/values.h" |
+#include "chrome/browser/chromeos/input_method/input_method_engine.h" |
#include "chrome/browser/chromeos/login/lock/screen_locker.h" |
#include "chrome/browser/chromeos/login/ui/user_adding_screen.h" |
#include "chrome/browser/chromeos/login/users/user_manager.h" |
@@ -23,10 +24,6 @@ |
#include "extensions/browser/extension_system.h" |
#include "extensions/common/manifest_handlers/background_info.h" |
-#if defined(USE_X11) |
-#include "chrome/browser/chromeos/input_method/input_method_engine.h" |
-#endif |
- |
namespace input_ime = extensions::api::input_ime; |
namespace KeyEventHandled = extensions::api::input_ime::KeyEventHandled; |
namespace DeleteSurroundingText = |
@@ -345,7 +342,6 @@ InputImeEventRouter::GetInstance() { |
bool InputImeEventRouter::RegisterImeExtension( |
const std::string& extension_id, |
const std::vector<extensions::InputComponentInfo>& input_components) { |
-#if defined(USE_X11) |
VLOG(1) << "RegisterImeExtension: " << extension_id; |
if (engine_map_[extension_id]) |
@@ -395,11 +391,6 @@ bool InputImeEventRouter::RegisterImeExtension( |
manager->AddInputMethodExtension(extension_id, descriptors, engine); |
return true; |
-#else |
- // TODO(spang): IME support under ozone. |
- NOTIMPLEMENTED(); |
- return false; |
-#endif |
} |
void InputImeEventRouter::UnregisterAllImes(const std::string& extension_id) { |