Revert of Moves code from chromeos/ime to ui/base/ime/chromeos.

chromeos/chromeos.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
     # These files lists are shared with the GN build.
     'chromeos_sources': [
       'accelerometer/accelerometer_reader.cc',
@@ skipping 234 matching lines @@
       'dbus/sms_client.cc',
       'dbus/sms_client.h',
       'dbus/system_clock_client.cc',
       'dbus/system_clock_client.h',
       'dbus/update_engine_client.cc',
       'dbus/update_engine_client.h',
       'dbus/volume_state.cc',
       'dbus/volume_state.h',
       'disks/disk_mount_manager.cc',
       'disks/disk_mount_manager.h',
+      'ime/component_extension_ime_manager.cc',
+      'ime/component_extension_ime_manager.h',
+      'ime/composition_text.cc',
+      'ime/composition_text.h',
+      'ime/extension_ime_util.cc',
+      'ime/extension_ime_util.h',
+      'ime/fake_ime_keyboard.cc',
+      'ime/fake_ime_keyboard.h',
+      'ime/ime_keyboard.cc',
+      'ime/ime_keyboard.h',
+      'ime/ime_keyboard_ozone.cc',
+      'ime/ime_keyboard_ozone.h',
+      'ime/ime_keyboard_x11.cc',
+      'ime/ime_keyboard_x11.h',
+      'ime/input_method_delegate.h',
+      'ime/input_method_descriptor.cc',
+      'ime/input_method_descriptor.h',
+      'ime/input_method_manager.cc',
+      'ime/input_method_manager.h',
+      'ime/input_method_whitelist.cc',
+      'ime/input_method_whitelist.h',
       'login/auth/auth_attempt_state.cc',
       'login/auth/auth_attempt_state.h',
       'login/auth/auth_attempt_state_resolver.cc',
       'login/auth/auth_attempt_state_resolver.h',
       'login/auth/auth_status_consumer.cc',
       'login/auth/auth_status_consumer.h',
       'login/auth/authenticator.cc',
       'login/auth/authenticator.h',
       'login/auth/cryptohome_authenticator.cc',
       'login/auth/cryptohome_authenticator.h',
@@ skipping 160 matching lines @@
       'dbus/services/proxy_resolution_service_provider_unittest.cc',
       'dbus/shill_client_unittest_base.cc',
       'dbus/shill_client_unittest_base.h',
       'dbus/shill_device_client_unittest.cc',
       'dbus/shill_ipconfig_client_unittest.cc',
       'dbus/shill_manager_client_unittest.cc',
       'dbus/shill_profile_client_unittest.cc',
       'dbus/shill_service_client_unittest.cc',
       'dbus/shill_third_party_vpn_driver_client_unittest.cc',
       'disks/disk_mount_manager_unittest.cc',
+      'ime/component_extension_ime_manager_unittest.cc',
+      'ime/composition_text_unittest.cc',
+      'ime/extension_ime_util_unittest.cc',
+      'ime/ime_keyboard_x11_unittest.cc',
+      'ime/input_method_manager.h',
+      'ime/input_method_whitelist_unittest.cc',
       'login/auth/key_unittest.cc',
       'login/login_state_unittest.cc',
       'network/auto_connect_handler_unittest.cc',
       'network/client_cert_resolver_unittest.cc',
       'network/geolocation_handler_unittest.cc',
       'network/host_resolver_impl_chromeos_unittest.cc',
       'network/managed_network_configuration_handler_unittest.cc',
       'network/network_cert_migrator_unittest.cc',
       'network/network_change_notifier_chromeos_unittest.cc',
       'network/network_configuration_handler_unittest.cc',
@@ skipping 46 matching lines @@
         '../ui/accelerometer/ui_accelerometer.gyp:ui_accelerometer',
         '../url/url.gyp:url_lib',
         'cryptohome_proto',
         'ime/input_method.gyp:gencode',
         'power_manager_proto',
       ],
       'defines': [
         'CHROMEOS_IMPLEMENTATION',
       ],
       'sources': [ '<@(chromeos_sources)' ],
+      'conditions': [
+        ['use_x11 == 1', {
+          'dependencies': [
+            '../build/linux/system.gyp:x11',
+            '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
+          ],
+        }, {
+          # use_x11 == 0
+          'sources!': [
+            'ime/keyboard_controller.cc',
+            'ime/ime_keyboard.h',
+          ],
+        }],
+      ],
     },
     {
       # GN version: //chromeos:test_support
       # This target contains mocks that can be used to write unit tests.
       'target_name': 'chromeos_test_support',
       'type': 'static_library',
       'dependencies': [
         '../build/linux/system.gyp:dbus',
         '../testing/gmock.gyp:gmock',
         'chromeos',
@@ skipping 20 matching lines @@
         'dbus/mock_shill_manager_client.cc',
         'dbus/mock_shill_manager_client.h',
         'dbus/mock_shill_profile_client.cc',
         'dbus/mock_shill_profile_client.h',
         'dbus/mock_shill_service_client.cc',
         'dbus/mock_shill_service_client.h',
         'dbus/services/service_provider_test_helper.cc',
         'dbus/services/service_provider_test_helper.h',
         'disks/mock_disk_mount_manager.cc',
         'disks/mock_disk_mount_manager.h',
+        'ime/mock_component_extension_ime_manager_delegate.cc',
+        'ime/mock_component_extension_ime_manager_delegate.h',
         'login/auth/fake_extended_authenticator.cc',
         'login/auth/fake_extended_authenticator.h',
         'login/auth/mock_auth_attempt_state_resolver.cc',
         'login/auth/mock_auth_attempt_state_resolver.h',
         'login/auth/mock_auth_status_consumer.cc',
         'login/auth/mock_auth_status_consumer.h',
         'login/auth/mock_authenticator.cc',
         'login/auth/mock_authenticator.h',
         'login/auth/mock_url_fetchers.cc',
         'login/auth/mock_url_fetchers.h',
@@ skipping 29 matching lines @@
       # If you edit the file list of this target, please edit BUILD.gn as well.
       'sources': [
         'dbus/fake_power_manager_client.cc',
         'dbus/fake_power_manager_client.h',
         'dbus/fake_session_manager_client.cc',
         'dbus/fake_session_manager_client.h',
         'dbus/fake_shill_manager_client.cc',
         'dbus/fake_shill_manager_client.h',
         'dbus/fake_update_engine_client.cc',
         'dbus/fake_update_engine_client.h',
+        'ime/fake_input_method_delegate.cc',
+        'ime/fake_input_method_delegate.h',
       ],
       'include_dirs': [
         '..',
       ],
     },
     {
       # GN version: //chromeos:chromeos_unittests
       'target_name': 'chromeos_unittests',
       'type': 'executable',
       'dependencies': [
@@ skipping 19 matching lines @@
       'include_dirs': [
         '..',
       ],
       'conditions': [
         [ 'use_allocator!="none"', {
           'dependencies': [
             '../base/allocator/allocator.gyp:allocator',
           ],
           },
         ],
+        ['use_x11 == 1', {
+          'dependencies': [
+            '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
+          ],
+        }]
       ],
     },
     {
       # GN version: //chromeos:power_manager_proto
       # Protobuf compiler/generator for power-manager related protocol buffers.
       'target_name': 'power_manager_proto',
       'type': 'static_library',
       'sources': [
         '../third_party/cros_system_api/dbus/power_manager/input_event.proto',
         '../third_party/cros_system_api/dbus/power_manager/peripheral_battery_status.proto',
@@ skipping 31 matching lines @@
         '../third_party/cros_system_api/dbus/cryptohome/signed_secret.proto',
       ],
       'variables': {
         'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome',
         'proto_out_dir': 'chromeos/cryptohome',
       },
       'includes': ['../build/protoc.gypi'],
     },
   ],
 }