More input focus fix

views/widget/native_widget_views.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_views.h"
 
 #include "ui/gfx/compositor/compositor.h"
 #include "views/desktop/desktop_window_view.h"
 #include "views/view.h"
 #include "views/views_delegate.h"
@@ skipping 51 matching lines @@
     return;
   active_ = active;
   delegate_->OnNativeWidgetActivationChanged(active);
 
   // TODO(oshima): Focus change should be separated from window activation.
   // This will be fixed when we have WM API.
   Widget* widget = GetWidget();
   if (widget->is_top_level()) {
     InputMethod* input_method = widget->GetInputMethodDirect();
     if (active) {
-      input_method->OnFocus();
+      if (input_method)
+        input_method->OnFocus();
       // See description of got_initial_focus_in_ for details on this.
       widget->GetFocusManager()->RestoreFocusedView();
     } else {
-      input_method->OnBlur();
+      if (input_method)
+        input_method->OnBlur();
       widget->GetFocusManager()->StoreFocusedView();
     }
   }
   view_->SchedulePaint();
 }
 
 bool NativeWidgetViews::OnKeyEvent(const KeyEvent& key_event) {
-  InputMethod* input_method = GetWidget()->GetInputMethodDirect();
+  InputMethod* input_method = GetWidget()->GetInputMethod();
   DCHECK(input_method);
   input_method->DispatchKeyEvent(key_event);
   return true;
 }
 
 void NativeWidgetViews::DispatchKeyEventPostIME(const KeyEvent& key) {
   // TODO(oshima): GTK impl handles menu_key in special way. This may be
   // necessary when running under NativeWidgetX.
   delegate_->OnKeyEvent(key);
 }
@@ skipping 413 matching lines @@
 
 const internal::NativeWidgetPrivate*
     NativeWidgetViews::GetParentNativeWidget() const {
   const Widget* containing_widget = view_ ? view_->GetWidget() : NULL;
   return containing_widget ? static_cast<const internal::NativeWidgetPrivate*>(
       containing_widget->native_widget()) :
       NULL;
 }
 
 }  // namespace views