summaryrefslogtreecommitdiffstats
path: root/chromeos/chromeos.gyp
diff options
context:
space:
mode:
authorjochen <jochen@chromium.org>2014-11-26 23:59:52 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-27 08:00:12 +0000
commit857735b6255938981bf2dec4aee80e7bc6523631 (patch)
treefc590ad0248402227511017122596102fef9e36c /chromeos/chromeos.gyp
parent9917a3671cafa9d31a071a530b9ce10ce0661bc9 (diff)
downloadchromium_src-857735b6255938981bf2dec4aee80e7bc6523631.zip
chromium_src-857735b6255938981bf2dec4aee80e7bc6523631.tar.gz
chromium_src-857735b6255938981bf2dec4aee80e7bc6523631.tar.bz2
Revert of Moves code from chromeos/ime to ui/base/ime/chromeos. (patchset #18 id:340001 of https://codereview.chromium.org/727143002/)
Reason for revert: fails to compile on Linux ChromiumOS GN clang: error: no such file or directory: '../../chromeos/ime/mock_component_extension_ime_manager_delegate.cc' Original issue's description: > Moves code from chromeos/ime to ui/base/ime/chromeos. > > This is because the code under chromeos/ime has inappropriate dependencies to src/ui. > This cl doesn't include any logic changes in code, and only contains changes of moving files, changing includes, and necessary changes in GYPs and build rules. > > Note: > 1) the input_methods.txt & gen_input_methods.py remain unchanged because auto-test requires input_methods.txt file to be available, and input_method_whitelist needs the generated input_methods.h for compile. It could be moved in later CLs. > 2) We've been discussing the naming for ui/chromeos/ime, which could be renamed to something for "views". It can be done in a separated cl. > > TBR=sky@chromium.org > BUG=431863 > TEST=Verified on linux_chromeos. > > Committed: https://crrev.com/9917a3671cafa9d31a071a530b9ce10ce0661bc9 > Cr-Commit-Position: refs/heads/master@{#305964} TBR=yukishiino@chromium.org,stevenjb@chromium.org,sky@chromium.org,mukai@chromium.org,pkasting@chromium.org,derat@chromium.org,shuchen@chromium.org NOTREECHECKS=true NOTRY=true BUG=431863 Review URL: https://codereview.chromium.org/750353004 Cr-Commit-Position: refs/heads/master@{#305965}
Diffstat (limited to 'chromeos/chromeos.gyp')
-rw-r--r--chromeos/chromeos.gyp50
1 files changed, 50 insertions, 0 deletions
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index 01f2c02..485c7f6 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -252,6 +252,27 @@
'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',
@@ -432,6 +453,12 @@
'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',
@@ -498,6 +525,20 @@
'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
@@ -538,6 +579,8 @@
'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',
@@ -587,6 +630,8 @@
'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': [
'..',
@@ -626,6 +671,11 @@
],
},
],
+ ['use_x11 == 1', {
+ 'dependencies': [
+ '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
+ ],
+ }]
],
},
{