Revert 219673 "Fix Views Combobox and Tree View text input."

trunk/src/ui/views/ime/input_method_base.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/ime/input_method_base.h"
 
 #include "base/logging.h"
 #include "ui/base/events/event.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/views/view.h"
@@ skipping 25 matching lines @@
   widget->GetFocusManager()->AddFocusChangeListener(this);
 }
 
 views::View* InputMethodBase::GetFocusedView() const {
   return widget_ ? widget_->GetFocusManager()->GetFocusedView() : NULL;
 }
 
 void InputMethodBase::OnTextInputTypeChanged(View* view) {}
 
 ui::TextInputClient* InputMethodBase::GetTextInputClient() const {
-  return GetFocusedView() ? GetFocusedView()->GetTextInputClient() : NULL;
+  return (widget_ && widget_->IsActive() && GetFocusedView()) ?
+      GetFocusedView()->GetTextInputClient() : NULL;
 }
 
 ui::TextInputType InputMethodBase::GetTextInputType() const {
   ui::TextInputClient* client = GetTextInputClient();
   return client ? client->GetTextInputType() : ui::TEXT_INPUT_TYPE_NONE;
 }
 
 bool InputMethodBase::IsMock() const {
   return false;
 }
@@ skipping 41 matching lines @@
 
 void InputMethodBase::DetachFromWidget() {
   if (!widget_)
     return;
 
   widget_->GetFocusManager()->RemoveFocusChangeListener(this);
   widget_ = NULL;
 }
 
 }  // namespace views