summaryrefslogtreecommitdiffstats
path: root/views/widget
diff options
context:
space:
mode:
authoroshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-29 19:43:21 +0000
committeroshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-29 19:43:21 +0000
commit8f2ffcecd29fff4c7d38f4a9b46c65aaafb55560 (patch)
tree21e1ecbe53b8d07b13a3c676f0278d1b3c88a31c /views/widget
parent5dec2ba31039b6aacd5f5e5de0fbc945a736e580 (diff)
downloadchromium_src-8f2ffcecd29fff4c7d38f4a9b46c65aaafb55560.zip
chromium_src-8f2ffcecd29fff4c7d38f4a9b46c65aaafb55560.tar.gz
chromium_src-8f2ffcecd29fff4c7d38f4a9b46c65aaafb55560.tar.bz2
minor fixes to get virtual keyboard work on views desktop without ibus
* Call OnTextInputTypeChanged from Mock class (which is used when ibus is not present) * Don't create InputMethod in desktop window. * Fix comment on RWHVV to be more accurate. BUG=none TEST=none Review URL: http://codereview.chromium.org/7761008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98676 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget')
-rw-r--r--views/widget/native_widget_gtk.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/views/widget/native_widget_gtk.cc b/views/widget/native_widget_gtk.cc
index dae9c95..dd57b00 100644
--- a/views/widget/native_widget_gtk.cc
+++ b/views/widget/native_widget_gtk.cc
@@ -961,10 +961,11 @@ bool NativeWidgetGtk::HasMouseCapture() const {
}
InputMethod* NativeWidgetGtk::CreateInputMethod() {
- // Create input method when pure views is enabled.
+ // Create input method when pure views is enabled but not on views desktop.
// TODO(suzhe): Always enable input method when we start to use
// RenderWidgetHostViewViews in normal ChromeOS.
- if (views::Widget::IsPureViews()) {
+ if (views::Widget::IsPureViews() &&
+ !ViewsDelegate::views_delegate->GetDefaultParentView()) {
#if defined(HAVE_IBUS)
InputMethod* input_method =
InputMethodIBus::IsInputMethodIBusEnabled() ?
@@ -976,7 +977,7 @@ InputMethod* NativeWidgetGtk::CreateInputMethod() {
input_method->Init(GetWidget());
return input_method;
}
- // GTK's textfield handles IME.
+ // GTK's textfield or InputMethod in NativeWidgetViews will handle IME.
return NULL;
}