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

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: review fixes 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 e404546a5d6e033b82c1bd244170324a5c80fb63..e2b351d9169c93e2a006a888e89d4af6e0fc1b75 100644
--- a/ui/aura_shell/aura_shell.gyp
+++ b/ui/aura_shell/aura_shell.gyp
@@ -45,6 +45,8 @@
'default_container_layout_manager.h',
'desktop_background_view.cc',
'desktop_background_view.h',
+ 'event.cc',
+ 'event.h',
'root_window_event_filter.cc',
'root_window_event_filter.h',
'root_window_layout_manager.cc',
@@ -55,6 +57,8 @@
'drag_image_view.h',
'image_grid.cc',
'image_grid.h',
+ 'input_method_event_filter.cc',
+ 'input_method_event_filter.h',
'laptop_mode_layout_manager.cc',
'laptop_mode_layout_manager.h',
'launcher/app_launcher_button.cc',
@@ -123,6 +127,13 @@
'workspace/workspace_manager.h',
'workspace/workspace_observer.h',
],
+ 'conditions': [
+ ['use_ibus==1', {
+ 'dependencies': [
+ '../../build/linux/system.gyp:ibus',
+ ],
+ }],
+ ],
},
{
'target_name': 'aura_shell_unittests',
@@ -152,6 +163,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