Focus/InputMethod fix.

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 948 matching lines @@
 bool NativeWidgetGtk::HasMouseCapture() const {
   return GTK_WIDGET_HAS_GRAB(window_contents_) || has_pointer_grab_;
 }
 
 InputMethod* NativeWidgetGtk::CreateInputMethod() {
   // Create input method when pure views is enabled.
   // TODO(suzhe): Always enable input method when we start to use
   // RenderWidgetHostViewViews in normal ChromeOS.
   if (views::Widget::IsPureViews()) {
 #if defined(HAVE_IBUS)
-    return InputMethodIBus::IsInputMethodIBusEnabled() ?
+    InputMethod* input_method =
+        InputMethodIBus::IsInputMethodIBusEnabled() ?
         static_cast<InputMethod*>(new InputMethodIBus(this)) :
         static_cast<InputMethod*>(new InputMethodGtk(this));
 #else
-    return new InputMethodGtk(this);
+    InputMethod* input_method = new InputMethodGtk(this);
 #endif
+    if (has_focus_)
+      input_method->OnFocus();
+    return input_method;
   }
   // GTK's textfield handles IME.
   return NULL;
 }
 
 void NativeWidgetGtk::CenterWindow(const gfx::Size& size) {
   gfx::Rect center_rect;
 
   GtkWindow* parent = gtk_window_get_transient_for(GetNativeWindow());
   if (parent) {
@@ skipping 666 matching lines @@
     GetWidget()->SetInitialFocus();
   }
   return false;
 }
 
 gboolean NativeWidgetGtk::OnFocusOut(GtkWidget* widget, GdkEventFocus* event) {
   if (!has_focus_)
     return false;  // This is the second focus-out event in a row, ignore it.
   has_focus_ = false;
 
-  if (GetWidget()->is_top_level())
+  if (!GetWidget()->is_top_level())
     return false;
 
   // Only top-level Widget should have an InputMethod instance.
   InputMethod* input_method = GetWidget()->GetInputMethodDirect();
   if (input_method)
     input_method->OnBlur();
   return false;
 }
 
 gboolean NativeWidgetGtk::OnEventKey(GtkWidget* widget, GdkEventKey* event) {
@@ skipping 568 matching lines @@
     button_pressed = event->type == GDK_BUTTON_PRESS ||
         event->type == GDK_2BUTTON_PRESS ||
         event->type == GDK_3BUTTON_PRESS;
     gdk_event_free(event);
   }
   return button_pressed;
 }
 
 }  // namespace internal
 }  // namespace views