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

Unified Diff: ui/aura/aura.gyp

Issue 10332145: aura/ash split: Moves RootWindowEventFilter and InputMethodEventFilter to ui/aura/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved to ui/aura/shared/ Created 8 years, 7 months 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 abf046668993eb9999b8751488c8ced6fe663e34..48c38334a4ec0bc21c115702092fc766abe5a504 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -57,8 +57,6 @@
'desktop/desktop_activation_client.h',
'desktop/desktop_dispatcher_client.cc',
'desktop/desktop_dispatcher_client.h',
- 'desktop/desktop_root_window_event_filter.cc',
- 'desktop/desktop_root_window_event_filter.h',
'desktop/desktop_screen.h',
'desktop/desktop_screen_win.cc',
'desktop/desktop_screen_win.h',
@@ -98,6 +96,10 @@
'root_window_view_mac.mm',
'root_window.cc',
'root_window.h',
+ 'shared/input_method_event_filter.cc',
+ 'shared/input_method_event_filter.h',
+ 'shared/root_window_event_filter.cc',
+ 'shared/root_window_event_filter.h',
'single_monitor_manager.cc',
'single_monitor_manager.h',
'ui_controls_win.cc',
@@ -189,7 +191,7 @@
'<@(pak_inputs)'],
},
],
- },
+ },
{
'target_name': 'aura_demo',
'type': 'executable',
@@ -241,6 +243,7 @@
'test/test_suite.cc',
'test/test_suite.h',
'root_window_unittest.cc',
+ 'shared/input_method_event_filter_unittest.cc',
'event_filter_unittest.cc',
'event_unittest.cc',
'window_unittest.cc',

Powered by Google App Engine
This is Rietveld 408576698