Relanding focus manager refactoring

chrome/browser/views/tab_contents/native_tab_contents_container_win.cc

 // Copyright (c) 2009 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 "chrome/browser/views/tab_contents/native_tab_contents_container_win.h"
 
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/tab_contents/tab_contents_container.h"
+#include "chrome/browser/views/tab_contents/tab_contents_view_win.h"
+
 #include "views/focus/focus_manager.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabContentsContainerWin, public:
 
 NativeTabContentsContainerWin::NativeTabContentsContainerWin(
     TabContentsContainer* container)
     : container_(container) {
 }
 
@@ skipping 16 matching lines @@
   // TODO(brettw) should this move to NativeViewHost::Detach which is called
   // below?
   // It needs cleanup regardless.
   HWND container_hwnd = contents->GetNativeView();
   if (container_hwnd) {
     // Hide the contents before adjusting its parent to avoid a full desktop
     // flicker.
     ShowWindow(container_hwnd, SW_HIDE);
 
     // Reset the parent to NULL to ensure hidden tabs don't receive messages.
-    ::SetParent(container_hwnd, NULL);
+    static_cast<TabContentsViewWin*>(contents->view())->Unparent();
   }
 
   // Now detach the TabContents.
   Detach();
 }
 
 void NativeTabContentsContainerWin::SetFastResize(bool fast_resize) {
   set_fast_resize(fast_resize);
 }
 
@@ skipping 70 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabContentsContainer, public:
 
 // static
 NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer(
     TabContentsContainer* container) {
   return new NativeTabContentsContainerWin(container);
 }