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

Unified Diff: ui/views/widget/native_widget_gtk.cc

Issue 8800002: Remove views::InputMethodIBus. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: final rebase Created 9 years 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 | « ui/views/views.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/native_widget_gtk.cc
diff --git a/ui/views/widget/native_widget_gtk.cc b/ui/views/widget/native_widget_gtk.cc
index a970976de5e456fb3a36f9662994d09430605eab..e7e8fd03f6f067a46b0d8c782dac05bb63dbcc00 100644
--- a/ui/views/widget/native_widget_gtk.cc
+++ b/ui/views/widget/native_widget_gtk.cc
@@ -45,10 +45,6 @@
#include "ui/views/widget/tooltip_manager_gtk.h"
#include "ui/views/widget/widget_delegate.h"
-#if defined(HAVE_IBUS)
-#include "ui/views/ime/input_method_ibus.h"
-#endif
-
using ui::OSExchangeData;
using ui::OSExchangeDataProviderGtk;
using ui::ActiveWindowWatcherX;
@@ -949,17 +945,8 @@ bool NativeWidgetGtk::HasMouseCapture() const {
InputMethod* NativeWidgetGtk::CreateInputMethod() {
// 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 defined(HAVE_IBUS)
- InputMethod* input_method =
- InputMethodIBus::IsInputMethodIBusEnabled() ?
- static_cast<InputMethod*>(new InputMethodIBus(this)) :
- static_cast<InputMethod*>(new InputMethodGtk(this));
-#else
InputMethod* input_method = new InputMethodGtk(this);
-#endif
input_method->Init(GetWidget());
return input_method;
}
« no previous file with comments | « ui/views/views.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698