Support IME extensions for Ozone.

After cl https://codereview.chromium.org/324903002/, the X11 dependencies have been removed from IMF except for ImeKeyboard implementation for Ozone.
Without a valid ImeKeyboard implementation IME extensions can still work.

BUG=362698
TEST=Verified on Pixel device.

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

Cr-Commit-Position: refs/heads/master@{#289319}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289319 0039d316-1c4b-4281-b951-d872f2087c98

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) {

chrome/chrome_browser_chromeos.gypi

@@ -1157,8 +1157,6 @@
             'browser/chromeos/events/system_key_event_listener.h',
             'browser/chromeos/events/xinput_hierarchy_changed_event_listener.cc',
             'browser/chromeos/events/xinput_hierarchy_changed_event_listener.h',
-            'browser/chromeos/input_method/input_method_engine.cc',
-            'browser/chromeos/input_method/input_method_engine.h',
           ],
         }],
       ],

chrome/chrome_tests_unit.gypi

@@ -2763,10 +2763,6 @@
           'sources!': [
             # crbug.com/354036
             'browser/chromeos/events/event_rewriter_unittest.cc',
-
-            # crbug.com/362698
-            'browser/chromeos/input_method/input_method_engine_unittest.cc',
-            'browser/chromeos/input_method/input_method_manager_impl_unittest.cc',
           ],
         }],
         ['enable_plugin_installation==0', {

ui/base/ime/input_method_factory.cc

@@ -6,7 +6,7 @@
 
 #include "ui/base/ime/mock_input_method.h"
 
-#if defined(OS_CHROMEOS) && defined(USE_X11)
+#if defined(OS_CHROMEOS)
 #include "ui/base/ime/input_method_chromeos.h"
 #elif defined(OS_WIN)
 #include "base/win/metro.h"
@@ -39,7 +39,7 @@ scoped_ptr<InputMethod> CreateInputMethod(
   if (g_input_method_set_for_testing)
     return scoped_ptr<InputMethod>(new MockInputMethod(delegate));
 
-#if defined(OS_CHROMEOS) && defined(USE_X11)
+#if defined(OS_CHROMEOS)
   return scoped_ptr<InputMethod>(new InputMethodChromeOS(delegate));
 #elif defined(OS_WIN)
   if (IsRemoteInputMethodWinRequired(widget))

ui/base/ui_base.gyp

@@ -644,7 +644,7 @@
             'ime/input_method_minimal.h',
           ],
         }],
-        ['chromeos==0 or use_x11==0', {
+        ['chromeos==0', {
           'sources!': [
             'ime/input_method_chromeos.cc',
             'ime/input_method_chromeos.h',
@@ -678,8 +678,6 @@
           'sources!': [
             'ime/composition_text_util_pango.cc',
             'ime/composition_text_util_pango.h',
-            'ime/chromeos/character_composer.cc',
-            'ime/chromeos/character_composer.h',
           ],
         }],
       ],