diff options
| author | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-22 00:48:14 +0000 |
|---|---|---|
| committer | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-22 00:48:14 +0000 |
| commit | bc3a32109fd31f4bee7d9d55f1d68a454a26c57c (patch) | |
| tree | 442fe94240075c86ee04b4c1ba9fa9820c681b00 /views/views.gyp | |
| parent | 16a7011e429b0e447b57b38e5d5339d6e1ce9af6 (diff) | |
| download | chromium_src-bc3a32109fd31f4bee7d9d55f1d68a454a26c57c.zip chromium_src-bc3a32109fd31f4bee7d9d55f1d68a454a26c57c.tar.gz chromium_src-bc3a32109fd31f4bee7d9d55f1d68a454a26c57c.tar.bz2 | |
Add character composition
Implemented character composition from key strokes starting with dead keys or compose key
BUG=chromium-os:13882, chromium-os:15925
TEST=
Review URL: http://codereview.chromium.org/6979023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89948 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
| -rw-r--r-- | views/views.gyp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/views/views.gyp b/views/views.gyp index 1f84df7..ef59248 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -287,6 +287,8 @@ 'focus/focus_util_win.h', 'focus/view_storage.cc', 'focus/view_storage.h', + 'ime/character_composer.cc', + 'ime/character_composer.h', 'ime/input_method.h', 'ime/input_method_delegate.h', 'ime/input_method_base.cc', @@ -437,6 +439,12 @@ }], ], }], + ['chromeos!=1', { + 'sources/': [ + ['exclude', 'ime/character_composer.cc'], + ['exclude', 'ime/character_composer.h'], + ], + }], ['use_ibus==1', { 'dependencies': [ '../build/linux/system.gyp:ibus', @@ -488,6 +496,7 @@ 'focus/focus_manager_unittest.cc', 'ime/mock_input_method.cc', 'ime/mock_input_method.h', + 'ime/character_composer_unittest.cc', 'layout/grid_layout_unittest.cc', 'layout/box_layout_unittest.cc', 'test/views_test_base.cc', @@ -536,6 +545,11 @@ '<(DEPTH)/third_party/wtl/include', ], }], + ['chromeos!=1', { + 'sources/': [ + ['exclude', 'ime/character_composer_unittest.cc'], + ], + }], ], }, { |