diff options
| author | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-12 01:00:00 +0000 |
|---|---|---|
| committer | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-12 01:00:00 +0000 |
| commit | 45510d9022d636a163762b67bf36a35b1c36cd3a (patch) | |
| tree | dfaefde0ac5bebd02183fc0e08c0b91118105d09 /views/views.gyp | |
| parent | 33c90eba54629044ddde7cc3aad60b4318d7688a (diff) | |
| download | chromium_src-45510d9022d636a163762b67bf36a35b1c36cd3a.zip chromium_src-45510d9022d636a163762b67bf36a35b1c36cd3a.tar.gz chromium_src-45510d9022d636a163762b67bf36a35b1c36cd3a.tar.bz2 | |
Add input method support for views and integrate ibus input framework
BUG=none
TEST=tested on Linux desktop
oshima landed for penghuang
Review URL: http://codereview.chromium.org/6480036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74709 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
| -rw-r--r-- | views/views.gyp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/views/views.gyp b/views/views.gyp index 045a2de..7097757 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -49,6 +49,7 @@ ]}], ['touchui==0', {'sources/': [ ['exclude', 'events/event_x.cc$'], + ['exclude', 'ime/'], ['exclude', 'native_menu_x.cc$'], ['exclude', 'native_menu_x.h$'], ['exclude', 'touchui/'], @@ -280,6 +281,9 @@ 'focus/focus_util_win.h', 'focus/view_storage.cc', 'focus/view_storage.h', + 'ime/ibus_ime_context.cc', + 'ime/ime_context.cc', + 'ime/ime_context.h', 'layout/box_layout.cc', 'layout/box_layout.h', 'layout/fill_layout.cc', @@ -415,6 +419,9 @@ ], }], ['touchui==1', { + 'dependencies': [ + '../build/linux/system.gyp:ibus', + ], 'defines': ['TOUCH_UI=1'], 'sources/': [ ['exclude', 'focus/accelerator_handler_gtk.cc'], @@ -428,6 +435,12 @@ ['exclude', 'touchui/touch_factory.h'], ], }], + ['"<!@(<(pkg-config) --atleast-version=1.3.99 ibus-1.0 || echo $?)"!=""', { + 'sources/': [ + ['exclude', 'ime/ibus_ime_context.cc'], + ], + 'defines': ['USE_DUMMY_IME_CONTEXT'], + }], ], }], ['OS=="win"', { |