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

trunk/src/ui/views/widget/native_widget_aura.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/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/client/activation_client.h"
@@ skipping 870 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, aura::client::FocusChangeObserver:
 
 void NativeWidgetAura::OnWindowFocused(aura::Window* gained_focus,
                                        aura::Window* lost_focus) {
   if (window_ == gained_focus) {
     // In aura, it is possible for child native widgets to take input and focus,
     // this differs from the behavior on windows.
+    if (GetWidget()->GetInputMethod())  // Null in tests.
+      GetWidget()->GetInputMethod()->OnFocus();
     delegate_->OnNativeFocus(lost_focus);
   } else if (window_ == lost_focus) {
-    if (destroying_)
+    // GetInputMethod() recreates the input method if it's previously been
+    // destroyed.  If we get called during destruction, the input method will be
+    // gone, and creating a new one and telling it that we lost the focus will
+    // trigger a DCHECK (the new input method doesn't think that we have the
+    // focus and doesn't expect a blur).  OnBlur() shouldn't be called during
+    // destruction unless WIDGET_OWNS_NATIVE_WIDGET is set (which is just the
+    // case in tests).
+    if (!destroying_) {
+      if (GetWidget()->GetInputMethod())
+        GetWidget()->GetInputMethod()->OnBlur();
+    } else {
       DCHECK_EQ(ownership_, Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET);
+    }
 
     aura::client::FocusClient* client = aura::client::GetFocusClient(window_);
     if (client)  // NULL during destruction of aura::Window.
       delegate_->OnNativeBlur(client->GetFocusedWindow());
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, aura::WindowDragDropDelegate implementation:
 
@@ skipping 205 matching lines @@
   return aura::Env::GetInstance()->is_mouse_button_down();
 }
 
 // static
 bool NativeWidgetPrivate::IsTouchDown() {
   return aura::Env::GetInstance()->is_touch_down();
 }
 
 }  // namespace internal
 }  // namespace views