Move more methods from NWW to HWNDMessageHandler.

ui/views/widget/widget.cc

 // Copyright (c) 2012 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 "ui/views/widget/widget.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/event.h"
@@ skipping 640 matching lines @@
   return toplevel_widget ? toplevel_widget->focus_manager_.get() : NULL;
 }
 
 const FocusManager* Widget::GetFocusManager() const {
   const Widget* toplevel_widget = GetTopLevelWidget();
   return toplevel_widget ? toplevel_widget->focus_manager_.get() : NULL;
 }
 
 InputMethod* Widget::GetInputMethod() {
   if (is_top_level()) {
-    if (!input_method_.get())
+    if (!input_method_.get()) {
       input_method_.reset(native_widget_->CreateInputMethod());
+      if (input_method_.get())
+        input_method_->Init(this);
+    }
     return input_method_.get();
   } else {
     Widget* toplevel = GetTopLevelWidget();
     // If GetTopLevelWidget() returns itself which is not toplevel,
     // the widget is detached from toplevel widget.
     // TODO(oshima): Fix GetTopLevelWidget() to return NULL
     // if there is no toplevel. We probably need to add GetTopMostWidget()
     // to replace some use cases.
     return (toplevel && toplevel != this) ? toplevel->GetInputMethod() : NULL;
   }
@@ skipping 640 matching lines @@
       if (bounds->height() < minimum_size.height())
         bounds->set_height(minimum_size.height());
     }
     return true;
   }
   return false;
 }
 
 void Widget::ReplaceInputMethod(InputMethod* input_method) {
   input_method_.reset(input_method);
-  input_method->set_delegate(native_widget_);
+  input_method->set_delegate(native_widget_->GetInputMethodDelegate());
   input_method->Init(this);
 }
 
 namespace internal {
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views