Force MimeHandlerView to always use BrowserPlugin

content/browser/web_contents/web_contents_impl.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_impl.h"
 
 #include <stddef.h>
 
 #include <cmath>
 #include <utility>
@@ skipping 1520 matching lines @@
     ui::Window* mus_window = aura::GetMusWindow(params.context);
     if (mus_window) {
       view_.reset(new WebContentsViewMus(mus_window, this, delegate,
                                          &render_view_host_delegate_view_));
     }
   }
 #endif
 
   if (!view_) {
     if (browser_plugin_guest_ &&
+        !browser_plugin_guest_->IsMimeHandlerViewGuest() &&
         BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
       view_.reset(new WebContentsViewChildFrame(
           this, delegate, &render_view_host_delegate_view_));
     } else {
       view_.reset(CreateWebContentsView(this, delegate,
                                         &render_view_host_delegate_view_));
     }
   }
 
   if (browser_plugin_guest_ &&
-      !BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
+      (!BrowserPluginGuestMode::UseCrossProcessFramesForGuests() ||
+       browser_plugin_guest_->IsMimeHandlerViewGuest())) {
     view_.reset(new WebContentsViewGuest(this, browser_plugin_guest_.get(),
                                          std::move(view_),
                                          &render_view_host_delegate_view_));
   }
   CHECK(render_view_host_delegate_view_);
   CHECK(view_.get());
 
   gfx::Size initial_size = params.initial_size;
   view_->CreateView(initial_size, params.context);
 
@@ skipping 3007 matching lines @@
 
 void WebContentsImpl::EnsureOpenerProxiesExist(RenderFrameHost* source_rfh) {
   WebContentsImpl* source_web_contents = static_cast<WebContentsImpl*>(
       WebContents::FromRenderFrameHost(source_rfh));
 
   if (source_web_contents) {
     // If this message is going to outer WebContents from inner WebContents,
     // then we should not create a RenderView. AttachToOuterWebContentsFrame()
     // already created a RenderFrameProxyHost for that purpose.
     if (GetBrowserPluginEmbedder() &&
-        BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
+        BrowserPluginGuestMode::UseCrossProcessFramesForGuests() &&
+        !source_web_contents->GetBrowserPluginGuest()
+             ->IsMimeHandlerViewGuest()) {
       return;
     }
 
     if (this != source_web_contents && GetBrowserPluginGuest()) {
       // We create a RenderFrameProxyHost for the embedder in the guest's render
       // process but we intentionally do not expose the embedder's opener chain
       // to it.
       source_web_contents->GetRenderManager()->CreateRenderFrameProxy(
           GetSiteInstance());
     } else {
@@ skipping 382 matching lines @@
     return node_->outer_contents_frame_tree_node_id();
 
   return FrameTreeNode::kFrameTreeNodeInvalidId;
 }
 
 RenderFrameHostManager* WebContentsImpl::GetRenderManager() const {
   return frame_tree_.root()->render_manager();
 }
 
 WebContentsImpl* WebContentsImpl::GetOuterWebContents() {
-  if (BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
+  if (BrowserPluginGuestMode::UseCrossProcessFramesForGuests() &&
+      (!browser_plugin_guest_ ||
+       !browser_plugin_guest_->IsMimeHandlerViewGuest())) {
     if (node_)
       return node_->outer_web_contents();
   } else {
-    if (GetBrowserPluginGuest())
-      return GetBrowserPluginGuest()->embedder_web_contents();
+    if (browser_plugin_guest_)
+      return browser_plugin_guest_->embedder_web_contents();
   }
   return nullptr;
 }
 
 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() const {
   return browser_plugin_guest_.get();
 }
 
 void WebContentsImpl::SetBrowserPluginGuest(BrowserPluginGuest* guest) {
   CHECK(!browser_plugin_guest_);
@@ skipping 173 matching lines @@
   for (RenderViewHost* render_view_host : render_view_host_set)
     render_view_host->OnWebkitPreferencesChanged();
 }
 
 void WebContentsImpl::SetJavaScriptDialogManagerForTesting(
     JavaScriptDialogManager* dialog_manager) {
   dialog_manager_ = dialog_manager;
 }
 
 }  // namespace content