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

Unified Diff: views/widget/native_widget_gtk.cc

Issue 7761008: minor fixes to get virtual keyboard work on views desktop without ibus (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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/ime/mock_input_method.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/widget/native_widget_gtk.cc
diff --git a/views/widget/native_widget_gtk.cc b/views/widget/native_widget_gtk.cc
index dae9c95519d401278c6ec1109b4c5bdaca1c724a..dd57b005935b97dda60c1a543fe7a9e95d125ec5 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;
}
« no previous file with comments | « views/ime/mock_input_method.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698