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

Unified Diff: ui/ui.gyp

Issue 8659033: IME (input method editor) support for Aura, part 1 of 3: Add ui/base/ime/ classes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, review fix Created 9 years 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 | « ui/base/ime/text_input_client.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 81cfb164759b302ba2c8ba69fedb86381f7893ba..0339d1be4f93cc350d43ab2fc0c1d385d0032fa7 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -131,6 +131,14 @@
'base/ime/composition_text.cc',
'base/ime/composition_text.h',
'base/ime/composition_underline.h',
+ 'base/ime/input_method.h',
+ 'base/ime/input_method_base.cc',
+ 'base/ime/input_method_base.h',
+ 'base/ime/input_method_delegate.h',
+ 'base/ime/input_method_ibus.cc',
+ 'base/ime/input_method_ibus.h',
+ 'base/ime/mock_input_method.cc',
+ 'base/ime/mock_input_method.h',
'base/ime/text_input_client.cc',
'base/ime/text_input_client.h',
'base/ime/text_input_type.h',
@@ -356,6 +364,10 @@
],
}, { # use_aura!=1
'sources!': [
+ 'base/ime/input_method_ibus.cc',
+ 'base/ime/input_method_ibus.h',
+ 'base/ime/mock_input_method.cc',
+ 'base/ime/mock_input_method.h',
'gfx/native_theme_aura.cc',
'gfx/native_theme_aura.h',
]
@@ -369,6 +381,21 @@
['exclude', 'gfx/path_win.cc'],
],
}],
+ ['use_ibus==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:ibus',
+ ],
+ 'sources/': [
+ ['exclude', 'base/ime/mock_input_method.cc'],
+ ['exclude', 'base/ime/mock_input_method.h'],
+ ],
+ }, { # else: use_ibus != 1
+ 'sources/': [
+ ['exclude', 'base/ime/input_method_ibus.cc'],
+ ['exclude', 'base/ime/input_method_ibus.h'],
+ ],
+ }],
+
['use_glib == 1', {
'dependencies': [
# font_gtk.cc uses fontconfig.
« no previous file with comments | « ui/base/ime/text_input_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698