Makes NativeViewHostWin change the parent of the hwnd when

content/browser/web_contents/web_contents_view_win.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 "content/browser/web_contents/web_contents_view_win.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_win.h"
 #include "content/browser/web_contents/interstitial_page_impl.h"
 #include "content/browser/web_contents/web_contents_drag_win.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/browser/web_contents/web_drag_dest_win.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_view_delegate.h"
+#include "ui/base/win/hidden_window.h"
 #include "ui/base/win/hwnd_subclass.h"
 #include "ui/gfx/screen.h"
 
 using content::RenderViewHost;
 using content::RenderWidgetHostView;
 using content::RenderWidgetHostViewWin;
 using content::WebContents;
 using content::WebContentsViewDelegate;
 
 namespace content {
 WebContentsView* CreateWebContentsView(
     WebContentsImpl* web_contents,
     WebContentsViewDelegate* delegate,
     RenderViewHostDelegateView** render_view_host_delegate_view) {
   WebContentsViewWin* rv = new WebContentsViewWin(web_contents, delegate);
   *render_view_host_delegate_view = rv;
   return rv;
 }
 }
 
 namespace {
 
-// We need to have a parent window for the compositing code to work correctly.
-//
-// A tab will not have a parent HWND whenever it is not active in its
-// host window - for example at creation time and when it's in the
-// background, so we provide a default widget to host them.
-//
-// It may be tempting to use GetDesktopWindow() instead, but this is
-// problematic as the shell sends messages to children of the desktop
-// window that interact poorly with us.
-//
-// See: http://crbug.com/16476
-class TempParent : public ui::WindowImpl {
- public:
-  static TempParent* Get() {
-    static TempParent* g_temp_parent;
-    if (!g_temp_parent) {
-      g_temp_parent = new TempParent();
-
-      g_temp_parent->set_window_style(WS_POPUP);
-      g_temp_parent->set_window_ex_style(WS_EX_TOOLWINDOW);
-      g_temp_parent->Init(GetDesktopWindow(), gfx::Rect());
-      EnableWindow(g_temp_parent->hwnd(), FALSE);
-    }
-    return g_temp_parent;
-  }
-
- private:
-  // Explicitly do nothing in Close. We do this as some external apps may get a
-  // handle to this window and attempt to close it.
-  void OnClose() {
-  }
-
-  BEGIN_MSG_MAP_EX(WebContentsViewWin)
-    MSG_WM_CLOSE(OnClose)
-  END_MSG_MAP()
-};
-
 typedef std::map<HWND, WebContentsViewWin*> HwndToWcvMap;
 HwndToWcvMap hwnd_to_wcv_map;
 
 void RemoveHwndToWcvMapEntry(WebContentsViewWin* wcv) {
   HwndToWcvMap::iterator it;
   for (it = hwnd_to_wcv_map.begin(); it != hwnd_to_wcv_map.end();) {
     if (it->second == wcv)
       hwnd_to_wcv_map.erase(it++);
     else
       ++it;
@@ skipping 57 matching lines @@
 
   if (IsWindow(hwnd()))
     DestroyWindow(hwnd());
 }
 
 void WebContentsViewWin::CreateView(const gfx::Size& initial_size) {
   initial_size_ = initial_size;
 
   set_window_style(WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
 
-  Init(TempParent::Get()->hwnd(), gfx::Rect(initial_size_));
+  Init(ui::GetHiddenWindow(), gfx::Rect(initial_size_));
 
   // Remove the root view drop target so we can register our own.
   RevokeDragDrop(GetNativeView());
   drag_dest_ = new WebDragDest(hwnd(), web_contents_);
   if (delegate_.get()) {
     content::WebDragDestDelegate* delegate = delegate_->GetDragDestDelegate();
     if (delegate)
       drag_dest_->set_delegate(delegate);
   }
 }
@@ skipping 358 matching lines @@
   si.nMin = 1;
   si.nMax = 100;
   si.nPage = 10;
   si.nPos = 50;
 
   ::SetScrollInfo(hwnd(), SB_HORZ, &si, FALSE);
   ::SetScrollInfo(hwnd(), SB_VERT, &si, FALSE);
 
   return 1;
 }