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

Unified Diff: ui/aura_shell/aura_shell.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: rebase, review 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
Index: ui/aura_shell/aura_shell.gyp
diff --git a/ui/aura_shell/aura_shell.gyp b/ui/aura_shell/aura_shell.gyp
index 005d3a1b678a49df79dd67f29623edbae51b3702..7c3a95ea75458fbbaf3bb88bbc167c42024ec774 100644
--- a/ui/aura_shell/aura_shell.gyp
+++ b/ui/aura_shell/aura_shell.gyp
@@ -55,6 +55,8 @@
'drag_image_view.h',
'image_grid.cc',
'image_grid.h',
+ 'input_method_event_filter.cc',
+ 'input_method_event_filter.h',
'launcher/app_launcher_button.cc',
'launcher/app_launcher_button.h',
'launcher/launcher.cc',
@@ -121,6 +123,13 @@
'workspace/workspace_manager.h',
'workspace/workspace_observer.h',
],
+ 'conditions': [
+ ['use_ibus==1', {
+ 'dependencies': [
+ '../../build/linux/system.gyp:ibus',
+ ],
+ }],
+ ],
},
{
'target_name': 'aura_shell_unittests',
@@ -150,6 +159,7 @@
'root_window_event_filter_unittest.cc',
'drag_drop_controller_unittest.cc',
'image_grid_unittest.cc',
+ 'input_method_event_filter_unittest.cc',
'launcher/launcher_model_unittest.cc',
'launcher/view_model_unittest.cc',
'launcher/view_model_utils_unittest.cc',

Powered by Google App Engine
This is Rietveld 408576698