Focus/InputMethod fix.

views/widget/widget.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/widget.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/l10n/l10n_font_util.h"
@@ skipping 578 matching lines @@
   }
   return default_theme_provider_.get();
 }
 
 FocusManager* Widget::GetFocusManager() {
   Widget* toplevel_widget = GetTopLevelWidget();
   return toplevel_widget ? toplevel_widget->focus_manager_.get() : NULL;
 }
 
 InputMethod* Widget::GetInputMethod() {
-  Widget* toplevel_widget = GetTopLevelWidget();
-  return toplevel_widget ? toplevel_widget->GetInputMethodDirect() : NULL;
+  if (is_top_level()) {
+    if (!input_method_.get())
+      ReplaceInputMethod(native_widget_->CreateInputMethod());
+    return input_method_.get();
+  } else {
+    Widget* toplevel = GetTopLevelWidget();
+    return toplevel ? toplevel->GetInputMethod() : NULL;
+  }
 }
 
 void Widget::RunShellDrag(View* view, const ui::OSExchangeData& data,
                           int operation) {
   dragged_view_ = view;
   native_widget_->RunShellDrag(view, data, operation);
   // If the view is removed during the drag operation, dragged_view_ is set to
   // NULL.
   if (view && dragged_view_ == view) {
     dragged_view_ = NULL;
@@ skipping 358 matching lines @@
 ui::TouchStatus Widget::OnTouchEvent(const TouchEvent& event) {
   ScopedEvent scoped(this, event);
   return static_cast<internal::RootView*>(GetRootView())->OnTouchEvent(event);
 }
 
 bool Widget::ExecuteCommand(int command_id) {
   return widget_delegate_->ExecuteWindowsCommand(command_id);
 }
 
 InputMethod* Widget::GetInputMethodDirect() {
-  if (!input_method_.get() && is_top_level())
-    ReplaceInputMethod(native_widget_->CreateInputMethod());
   return input_method_.get();
 }
 
 Widget* Widget::AsWidget() {
   return this;
 }
 
 const Widget* Widget::AsWidget() const {
   return this;
 }
@@ skipping 131 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views