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

Unified Diff: views/views.gyp

Issue 6688049: New InputMethod api for Views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update. 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
« views/ime/input_method_win.cc ('K') | « views/view.cc ('k') | no next file » | 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 4321af2c119f2466834cca464123ccd9bd45982d..7a268fec8719e9d80d19014b3b4da487eaa7f343 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/'],
@@ -285,6 +284,13 @@
'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_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',
@@ -441,6 +447,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!': [
@@ -483,6 +495,8 @@
'controls/textfield/textfield_views_model_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',
« views/ime/input_method_win.cc ('K') | « views/view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698