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

Unified Diff: ui/aura/aura.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: git mv desktop_host_unittest.cc desktop_host_ime_unittest.cc 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/aura/aura.gyp
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index fe414958cf43734060b540568e5a7cae771b77cc..5268f464a03e81e8c8850685e245f4245e220f46 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -52,6 +52,13 @@
'window_observer.h',
'window_types.h',
],
+ 'conditions': [
+ ['use_ibus==1', {
+ 'dependencies': [
+ '../../build/linux/system.gyp:ibus',
+ ],
+ }],
+ ],
},
{
'target_name': 'test_support_aura',
@@ -130,6 +137,7 @@
'test/run_all_unittests.cc',
'test/test_suite.cc',
'test/test_suite.h',
+ 'desktop_host_ime_unittest.cc',
'desktop_unittest.cc',
'event_filter_unittest.cc',
'window_unittest.cc',

Powered by Google App Engine
This is Rietveld 408576698