Hide the Legacy HWND when the RWHVA is destroyed.

content/browser/web_contents/web_contents_view_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 "content/browser/web_contents/web_contents_view_aura.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/metrics/histogram.h"
@@ skipping 727 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(WindowObserver);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsViewAura, public:
 
 WebContentsViewAura::WebContentsViewAura(
     WebContentsImpl* web_contents,
     WebContentsViewDelegate* delegate)
-    : web_contents_(web_contents),
+    : WebContentsObserver(web_contents),
+      web_contents_(web_contents),
       delegate_(delegate),
       current_drag_op_(blink::WebDragOperationNone),
       drag_dest_delegate_(NULL),
       current_rvh_for_drag_(NULL),
       overscroll_change_brightness_(false),
       current_overscroll_gesture_(OVERSCROLL_NONE),
       completed_overscroll_gesture_(OVERSCROLL_NONE),
       touch_editable_(TouchEditableImplAura::Create()),
       is_or_was_visible_(false) {
 }
@@ skipping 880 matching lines @@
   web_contents_->GetRenderViewHost()->DragTargetDrop(
       event.location(),
       gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(),
       ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
   if (drag_dest_delegate_)
     drag_dest_delegate_->OnDrop();
   current_drop_data_.reset();
   return ConvertFromWeb(current_drag_op_);
 }
 
+void WebContentsViewAura::RenderProcessGone(base::TerminationStatus status) {
+#if defined(OS_WIN)
+  UpdateLegacyHwndVisibility();
+#endif
+}
+
 void WebContentsViewAura::OnWindowVisibilityChanged(aura::Window* window,
                                                     bool visible) {
   // Ignore any visibility changes in the hierarchy below.
   if (window != window_.get() && window_->Contains(window))
     return;
 
   UpdateWebContentsVisibility(visible);
 }
 
 void WebContentsViewAura::UpdateWebContentsVisibility(bool visible) {
@@ skipping 12 matching lines @@
   }
   if (visible) {
     if (!web_contents_->should_normally_be_visible())
       web_contents_->WasShown();
   } else {
     if (web_contents_->should_normally_be_visible())
       web_contents_->WasHidden();
   }
 
 #if defined(OS_WIN)
+  UpdateLegacyHwndVisibility();
+#endif
+}
+
+#if defined(OS_WIN)
+void WebContentsViewAura::UpdateLegacyHwndVisibility() {
   if (!legacy_hwnd_)
     return;
 
+  bool visible = (window_->IsVisible() &&
+                  web_contents_->GetRenderWidgetHostView());
+
   if (visible && GetNativeView() && GetNativeView()->GetHost()) {
     legacy_hwnd_->UpdateParent(
         GetNativeView()->GetHost()->GetAcceleratedWidget());
     legacy_hwnd_->SetBounds(window_->GetBoundsInRootWindow());
     legacy_hwnd_->Show();
   } else {
     // We reparent the legacy Chrome_RenderWidgetHostHWND window to the global
     // hidden window on the same lines as Windowed plugin windows.
     legacy_hwnd_->UpdateParent(ui::GetHiddenWindow());
     legacy_hwnd_->Hide();
   }
-#endif
 }
 
-#if defined(OS_WIN)
 gfx::NativeViewAccessible
 WebContentsViewAura::GetNativeViewAccessible() {
   BrowserAccessibilityManager* manager =
       web_contents_->GetRootBrowserAccessibilityManager();
   if (!manager)
     return nullptr;
 
   return manager->GetRoot()->ToBrowserAccessibilityWin();
 }
 #endif
 
 }  // namespace content