diff options
| author | suzhe@google.com <suzhe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-01 22:59:32 +0000 |
|---|---|---|
| committer | suzhe@google.com <suzhe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-01 22:59:32 +0000 |
| commit | 4b99402b089ba598ae26c82d99c3c3d2fe0cd574 (patch) | |
| tree | f4fe9b7a92bc90b364c40b901919fee163b7061b /views/views.gyp | |
| parent | 4b8b6d844d019a612a02274d298e3dcffc42276b (diff) | |
| download | chromium_src-4b99402b089ba598ae26c82d99c3c3d2fe0cd574.zip chromium_src-4b99402b089ba598ae26c82d99c3c3d2fe0cd574.tar.gz chromium_src-4b99402b089ba598ae26c82d99c3c3d2fe0cd574.tar.bz2 | |
Refactor RenderWidgetHostViewViews to use the new input method API for Views.
This CL also fixes some issues related to NULL host_ pointer in the
original code. Hope the fixes are correct.
Another side effect of this CL is: it converts views::KeyEvent to NativeWebKeyboardEvent by using the conversion table of Views instead of WebInputEventFactory provided by WebKit. See bug 54315.
BUG=54315
BUG=75003
TEST=none
Review URL: http://codereview.chromium.org/6713083
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
| -rw-r--r-- | views/views.gyp | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/views/views.gyp b/views/views.gyp index 26e4d6d..c7fac12 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -285,15 +285,14 @@ 'focus/focus_util_win.h', 'focus/view_storage.cc', 'focus/view_storage.h', - '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_ibus.cc', + 'ime/input_method_ibus.h', 'ime/input_method_win.cc', 'ime/input_method_win.h', 'ime/text_input_client.h', @@ -446,18 +445,25 @@ ['exclude', 'touchui/touch_factory.h'], ], }], - ['"<!@(<(pkg-config) --atleast-version=1.3.99 ibus-1.0 || echo $?)"!=""', { + # TODO(suzhe): We should not check ibus version here. Instead, we + # should use a variable to control whether or not to use ibus. + ['"<!@(<(pkg-config) --atleast-version=1.3.99 ibus-1.0 || echo $?)"==""', { + 'defines': ['HAVE_IBUS=1'], 'sources/': [ - ['exclude', 'ime/ibus_ime_context.cc'], + ['exclude', 'ime/input_method_gtk.cc'], + ['exclude', 'ime/input_method_gtk.h'], + ], + }, { # else: no ibus + 'sources/': [ + ['exclude', 'ime/input_method_ibus.cc'], + ['exclude', 'ime/input_method_ibus.h'], ], - 'defines': ['USE_DUMMY_IME_CONTEXT'], }], ], }, { # else: touchui != 1 'sources!': [ - 'ime/ibus_ime_context.cc', - 'ime/ime_context.cc', - 'ime/ime_context.h', + 'ime/input_method_ibus.cc', + 'ime/input_method_ibus.h', ], }], ['OS=="win"', { |