Fix compile on linux when ibus is available.

views/widget/native_widget_gtk.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/widget/native_widget_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <X11/extensions/shape.h>
 #include <X11/Xatom.h>
@@ skipping 10 matching lines @@
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_gtk.h"
 #include "ui/base/gtk/gtk_windowing.h"
 #include "ui/base/gtk/scoped_handle_gtk.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/path.h"
 #include "views/views_delegate.h"
 #include "views/controls/textfield/native_textfield_views.h"
 #include "views/focus/view_storage.h"
+#include "views/ime/input_method_gtk.h"
 #include "views/widget/drop_target_gtk.h"
 #include "views/widget/gtk_views_fixed.h"
 #include "views/widget/gtk_views_window.h"
 #include "views/widget/tooltip_manager_gtk.h"
 #include "views/widget/widget_delegate.h"
 #include "views/window/native_window_gtk.h"
 
 #if defined(TOUCH_UI)
 #if defined(HAVE_XINPUT2)
 #include <gdk/gdkx.h>
 
 #include "ui/gfx/gtk_util.h"
 #include "views/touchui/touch_factory.h"
 #endif
 #endif
 
 #if defined(HAVE_IBUS)
 #include "views/ime/input_method_ibus.h"
-#else
-#include "views/ime/input_method_gtk.h"
 #endif
 
 using ui::OSExchangeData;
 using ui::OSExchangeDataProviderGtk;
 using ui::ActiveWindowWatcherX;
 
 namespace views {
 
 namespace {
 
@@ skipping 555 matching lines @@
 
   // Creates input method for toplevel widget after calling
   // delegate_->OnNativeWidgetCreated(), to make sure that focus manager is
   // already created at this point.
   // TODO(suzhe): Always enable input method when we start to use
   // RenderWidgetHostViewViews in normal ChromeOS.
   if (!child_ && NativeTextfieldViews::IsTextfieldViewsEnabled()) {
 #if defined(HAVE_IBUS)
     input_method_.reset(InputMethodIBus::IsInputMethodIBusEnabled() ?
                         static_cast<InputMethod*>(new InputMethodIBus(this)) :
                         static_cast<InputMethod*>(new InputMethodGtk(this)));

[sadrul, 2011/05/24 17:15:48]

The GTK IM can be used optionally even when ibus is available.

 #else
     input_method_.reset(new InputMethodGtk(this));
 #endif
     input_method_->Init(GetWidget());
   }
 
   if (opacity_ != 255)
     SetOpacity(opacity_);
 
   // Make sure we receive our motion events.
@@ skipping 1169 matching lines @@
 
   // And now, notify them that they have a brand new parent.
   for (NativeWidgets::iterator it = widgets.begin();
        it != widgets.end(); ++it) {
     (*it)->GetWidget()->NotifyNativeViewHierarchyChanged(true,
                                                          new_parent);
   }
 }
 
 }  // namespace views