Makes NativeViewHostWin change the parent of the hwnd when

ui/views/controls/native/native_view_host_win.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 "ui/views/controls/native/native_view_host_win.h"
 
 #include <oleacc.h>
 
 #include "base/logging.h"
+#include "ui/base/win/hidden_window.h"
+#include "ui/base/win/window_impl.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/widget/native_widget.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 16 matching lines @@
   // First hide the new window. We don't want anything to draw (like sub-hwnd
   // borders), when we change the parent below.
   ShowWindow(host_->native_view(), SW_HIDE);
 
   Widget::ReparentNativeView(host_->native_view(),
                              host_->GetWidget()->GetNativeView());
   host_->Layout();
 }
 
 void NativeViewHostWin::NativeViewDetaching(bool destroyed) {
-  if (!destroyed && installed_clip_)
-    UninstallClip();
+  if (!destroyed) {
+    if (installed_clip_)
+      UninstallClip();
+    ClearFocus();
+    SetParent(host_->native_view(), ui::GetHiddenWindow());
+  }
   installed_clip_ = false;
 }
 
 void NativeViewHostWin::AddedToWidget() {
   if (!IsWindow(host_->native_view()))
     return;
   HWND parent_hwnd = GetParent(host_->native_view());
   HWND widget_hwnd = host_->GetWidget()->GetNativeView();
   if (parent_hwnd != widget_hwnd)
     SetParent(host_->native_view(), widget_hwnd);
@@ skipping 77 matching lines @@
       hwnd, OBJID_CLIENT, IID_IAccessible,
       reinterpret_cast<void**>(&accessible));
 
   if (success == S_OK) {
     return accessible;
   } else {
     return NULL;
   }
 }
 
+void NativeViewHostWin::ClearFocus() {
+  FocusManager* focus_manager = host_->GetFocusManager();
+  if (!focus_manager || !focus_manager->GetFocusedView())
+    return;
+
+  Widget::Widgets widgets;
+  Widget::GetAllChildWidgets(host_->native_view(), &widgets);
+  for (Widget::Widgets::iterator i = widgets.begin(); i != widgets.end(); ++i) {
+    focus_manager->ViewRemoved((*i)->GetRootView());
+    if (!focus_manager->GetFocusedView())
+      return;
+  }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NativeViewHostWrapper, public:
 
 // static
 NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper(
     NativeViewHost* host) {
   return new NativeViewHostWin(host);
 }
 
 }  // namespace views