diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-24 03:48:32 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-24 03:48:32 +0000 |
| commit | edc809525d1af43470af1e990aa3edc2cfa9916f (patch) | |
| tree | 530565a546308af6abb5735aa793d736ed5d9e57 /views | |
| parent | 28c580ff91e3330ad755791ddcc5766e3a0310c9 (diff) | |
| download | chromium_src-edc809525d1af43470af1e990aa3edc2cfa9916f.zip chromium_src-edc809525d1af43470af1e990aa3edc2cfa9916f.tar.gz chromium_src-edc809525d1af43470af1e990aa3edc2cfa9916f.tar.bz2 | |
Fix touch compile after r86390.
ibus is not usable on lucid, so touchui build still needs to use ibus-gtk.
BUG=none
TEST=touchui compiles
TBR=hashimoto@chromium.org, oshima@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86394 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/views.gyp | 2 | ||||
| -rw-r--r-- | views/widget/native_widget_gtk.cc | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/views/views.gyp b/views/views.gyp index 694b5a36..2176bb2 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -431,8 +431,6 @@ 'sources/': [ ['exclude', 'focus/accelerator_handler_gtk.cc'], ['exclude', 'controls/menu/native_menu_gtk.cc'], - ['exclude', 'ime/input_method_gtk.cc'], - ['exclude', 'ime/input_method_gtk.h'], ], 'conditions': [ ['"<!@(<(pkg-config) --atleast-version=2.0 inputproto || echo $?)"!=""', { diff --git a/views/widget/native_widget_gtk.cc b/views/widget/native_widget_gtk.cc index c6edfd9..3a7b924 100644 --- a/views/widget/native_widget_gtk.cc +++ b/views/widget/native_widget_gtk.cc @@ -46,8 +46,7 @@ #if defined(HAVE_IBUS) #include "views/ime/input_method_ibus.h" -#endif -#if !defined(TOUCH_UI) +#else #include "views/ime/input_method_gtk.h" #endif @@ -621,9 +620,7 @@ void NativeWidgetGtk::InitNativeWidget(const Widget::InitParams& params) { // TODO(suzhe): Always enable input method when we start to use // RenderWidgetHostViewViews in normal ChromeOS. if (!child_ && NativeTextfieldViews::IsTextfieldViewsEnabled()) { -#if defined(TOUCH_UI) - input_method_.reset(new InputMethodIBus(this)); -#elif defined(HAVE_IBUS) +#if defined(HAVE_IBUS) input_method_.reset(InputMethodIBus::IsInputMethodIBusEnabled() ? static_cast<InputMethod*>(new InputMethodIBus(this)) : static_cast<InputMethod*>(new InputMethodGtk(this))); |