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

Unified Diff: views/views.gyp

Issue 6688049: New InputMethod api for Views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't dispatch the character when focus was changed by the key event. Created 9 years, 9 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
« no previous file with comments | « views/view.cc ('k') | views/widget/widget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/views.gyp
diff --git a/views/views.gyp b/views/views.gyp
index c5706add1ef266c639c6af518d987ac80d8196cb..8ff722e21ab41850d05a9daf94566aca29cc34be 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -49,7 +49,6 @@
]}],
['touchui==0', {'sources/': [
['exclude', 'events/event_x.cc$'],
- ['exclude', 'ime/'],
['exclude', 'native_menu_x.cc$'],
['exclude', 'native_menu_x.h$'],
['exclude', 'touchui/'],
@@ -286,6 +285,15 @@
'ime/ibus_ime_context.cc',
'ime/ime_context.cc',
'ime/ime_context.h',
+ 'ime/input_method.h',
+ 'ime/input_method_delegate.h',
+ 'ime/input_method_base.cc',
+ 'ime/input_method_base.h',
+ 'ime/input_method_gtk.cc',
+ 'ime/input_method_gtk.h',
+ 'ime/input_method_win.cc',
+ 'ime/input_method_win.h',
+ 'ime/text_input_client.h',
'layout/box_layout.cc',
'layout/box_layout.h',
'layout/fill_layout.cc',
@@ -442,6 +450,12 @@
'defines': ['USE_DUMMY_IME_CONTEXT'],
}],
],
+ }, { # else: touchui != 1
+ 'sources!': [
+ 'ime/ibus_ime_context.cc',
+ 'ime/ime_context.cc',
+ 'ime/ime_context.h',
+ ],
}],
['OS=="win"', {
'sources!': [
@@ -485,6 +499,8 @@
'events/event_unittest.cc',
'focus/accelerator_handler_gtk_unittest.cc',
'focus/focus_manager_unittest.cc',
+ 'ime/mock_input_method.cc',
+ 'ime/mock_input_method.h',
'layout/grid_layout_unittest.cc',
'layout/box_layout_unittest.cc',
'test/views_test_base.cc',
« no previous file with comments | « views/view.cc ('k') | views/widget/widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698