Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(267)

Unified Diff: views/views.gyp

Issue 6480036: Add input method support for views and integrate ibus input framework (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/ime/ime_context.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/views.gyp
diff --git a/views/views.gyp b/views/views.gyp
index 077c167e526db21275ac0ff7cfd81e4f2561a22e..10f4a41cbb3d9db3aaf2308a386334c6dbe42167 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',
@@ -411,6 +415,9 @@
],
}],
['touchui==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:ibus',
+ ],
'defines': ['TOUCH_UI=1'],
'sources/': [
['exclude', 'focus/accelerator_handler_gtk.cc'],
@@ -424,6 +431,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"', {
« no previous file with comments | « views/ime/ime_context.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698