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

Unified Diff: ui/ui.gyp

Issue 8576005: IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix RHWVA and ui::InputMethodBase Created 9 years, 1 month 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
Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 67af7060909cb73047e6e1d877fac2ba4f1ca1dd..e83d32fd302a822cf719ee4c2bbfe47514e48a39 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -131,6 +131,15 @@
'base/ime/composition_text.cc',
'base/ime/composition_text.h',
'base/ime/composition_underline.h',
+ 'base/ime/input_method.cc',
+ '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 +365,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 +382,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.

Powered by Google App Engine
This is Rietveld 408576698