Delete ibus_object and move ibus_text to chromeos/ime.

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,
   },
   'includes': [
     'chromeos_memory.gypi',
@@ skipping 152 matching lines @@
         'dbus/shill_ipconfig_client.h',
         'dbus/shill_manager_client.cc',
         'dbus/shill_manager_client.h',
         'dbus/shill_profile_client.cc',
         'dbus/shill_profile_client.h',
         'dbus/shill_service_client.cc',
         'dbus/shill_service_client.h',
         'dbus/shill_stub_helper.cc',
         'dbus/shill_stub_helper.h',
         'dbus/ibus/ibus_constants.h',
-        'dbus/ibus/ibus_object.cc',
-        'dbus/ibus/ibus_object.h',
-        'dbus/ibus/ibus_text.cc',
-        'dbus/ibus/ibus_text.h',
         'dbus/image_burner_client.cc',
         'dbus/image_burner_client.h',
         'dbus/introspectable_client.cc',
         'dbus/introspectable_client.h',
         'dbus/modem_messaging_client.cc',
         'dbus/modem_messaging_client.h',
         'dbus/permission_broker_client.cc',
         'dbus/permission_broker_client.h',
         'dbus/power_manager_client.cc',
         'dbus/power_manager_client.h',
@@ skipping 22 matching lines @@
         'ime/component_extension_ime_manager.cc',
         'ime/component_extension_ime_manager.h',
         'ime/extension_ime_util.cc',
         'ime/extension_ime_util.h',
         'ime/ibus_bridge.cc',
         'ime/ibus_bridge.h',
         'ime/ibus_daemon_controller.cc',
         'ime/ibus_daemon_controller.h',
         'ime/ibus_keymap.cc',
         'ime/ibus_keymap.h',
+        'ime/ibus_text.cc',
+        'ime/ibus_text.h',
         'ime/input_method_config.cc',
         'ime/input_method_config.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_property.cc',
         'ime/input_method_property.h',
         'ime/input_method_whitelist.cc',
@@ skipping 241 matching lines @@
         'power_manager_proto',
       ],
       'sources': [
         'app_mode/kiosk_oem_manifest_parser_unittest.cc',
         'attestation/attestation_flow_unittest.cc',
         'audio/cras_audio_handler_unittest.cc',
         'cryptohome/system_salt_getter_unittest.cc',
         'dbus/blocking_method_caller_unittest.cc',
         'dbus/cros_disks_client_unittest.cc',
         'dbus/gsm_sms_client_unittest.cc',
-        'dbus/ibus/ibus_object_unittest.cc',
-        'dbus/ibus/ibus_text_unittest.cc',
         'dbus/introspectable_client_unittest.cc',
         'dbus/modem_messaging_client_unittest.cc',
         'dbus/nfc_client_unittest.cc',
         'dbus/power_policy_controller_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',
         'disks/disk_mount_manager_unittest.cc',
         'display/output_configurator_unittest.cc',
         'display/output_util_unittest.cc',
         'ime/candidate_window_unittest.cc',
         'ime/component_extension_ime_manager_unittest.cc',
         'ime/extension_ime_util_unittest.cc',
+        'ime/ibus_text_unittest.cc',
         'ime/input_method_manager.h',
         'ime/input_method_property_unittest.cc',
         'ime/input_method_whitelist_unittest.cc',
         'ime/xkeyboard_unittest.cc',
         'login/login_state_unittest.cc',
         'network/client_cert_resolver_unittest.cc',
         'network/geolocation_handler_unittest.cc',
         'network/managed_network_configuration_handler_unittest.cc',
         'network/network_cert_migrator_unittest.cc',
         'network/network_change_notifier_chromeos_unittest.cc',
@@ skipping 43 matching lines @@
         '../third_party/cros_system_api/dbus/power_manager/suspend.proto',
       ],
       'variables': {
         'proto_in_dir': '../third_party/cros_system_api/dbus/power_manager',
         'proto_out_dir': 'chromeos/dbus/power_manager',
       },
       'includes': ['../build/protoc.gypi'],
     },
   ],
 }