diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc index 4dca843104ac..63020b374688 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc @@ -2561,15 +2561,22 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { std::string unique_name; frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name); - WebContentsViewDelegate* delegate = - GetContentClient()->browser()->GetWebContentsViewDelegate(this); + if (params.view && params.delegate_view) { + view_.reset(params.view); + render_view_host_delegate_view_ = params.delegate_view; + } - if (browser_plugin_guest_) { - view_.reset(new WebContentsViewChildFrame( - this, delegate, &render_view_host_delegate_view_)); - } else { - view_.reset(CreateWebContentsView(this, delegate, - &render_view_host_delegate_view_)); + if (!view_) { + WebContentsViewDelegate* delegate = + GetContentClient()->browser()->GetWebContentsViewDelegate(this); + + if (browser_plugin_guest_) { + view_.reset(new WebContentsViewChildFrame( + this, delegate, &render_view_host_delegate_view_)); + } else { + view_.reset(CreateWebContentsView(this, delegate, + &render_view_host_delegate_view_)); + } } CHECK(render_view_host_delegate_view_); CHECK(view_.get()); @@ -3368,6 +3375,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow( // objects. create_params.renderer_initiated_creation = !is_new_browsing_instance; + if (delegate_) { + delegate_->GetCustomWebContentsView(this, + params.target_url, + render_process_id, + opener->GetRoutingID(), + &create_params.view, + &create_params.delegate_view); + } + std::unique_ptr new_contents; if (!is_guest) { create_params.context = view_->GetNativeView(); @@ -6850,6 +6866,10 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, // This is an outermost WebContents. SetAsFocusedWebContentsIfNecessary(); } + + observers_.ForEachObserver([&](WebContentsObserver* observer) { + observer->OnFrameFocused(node->current_frame_host()); + }); } void WebContentsImpl::DidCallFocus() { diff --git content/public/browser/web_contents.cc content/public/browser/web_contents.cc index f1dcf53ea481..192f7c0ddd04 100644 --- content/public/browser/web_contents.cc +++ content/public/browser/web_contents.cc @@ -29,6 +29,7 @@ WebContents::CreateParams::CreateParams(BrowserContext* context, renderer_initiated_creation(false), desired_renderer_state(kOkayToHaveRendererProcess), starting_sandbox_flags(network::mojom::WebSandboxFlags::kNone), + delegate_view(nullptr), is_never_visible(false) {} WebContents::CreateParams::CreateParams(const CreateParams& other) = default; diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h index f1c25ed4cf62..8bb6e9a374c7 100644 --- content/public/browser/web_contents.h +++ content/public/browser/web_contents.h @@ -82,8 +82,10 @@ class BrowserContext; class BrowserPluginGuestDelegate; class RenderFrameHost; class RenderViewHost; +class RenderViewHostDelegateView; class RenderWidgetHostView; class WebContentsDelegate; +class WebContentsView; class WebUI; struct CustomContextMenuContext; struct DropData; @@ -212,6 +214,10 @@ class WebContents : public PageNavigator, // Sandboxing flags set on the new WebContents. network::mojom::WebSandboxFlags starting_sandbox_flags; + // Optionally specify the view and delegate view. + content::WebContentsView* view; + content::RenderViewHostDelegateView* delegate_view; + // Value used to set the last time the WebContents was made active, this is // the value that'll be returned by GetLastActiveTime(). If this is left // default initialized then the value is not passed on to the WebContents diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h index a10c5caf5a4b..ef8d3c3c1056 100644 --- content/public/browser/web_contents_delegate.h +++ content/public/browser/web_contents_delegate.h @@ -62,10 +62,12 @@ class EyeDropperListener; class FileSelectListener; class JavaScriptDialogManager; class RenderFrameHost; +class RenderViewHostDelegateView; class RenderWidgetHost; class SessionStorageNamespace; class SiteInstance; class WebContentsImpl; +class WebContentsView; struct ContextMenuParams; struct DropData; struct MediaPlayerWatchTime; @@ -338,6 +340,14 @@ class CONTENT_EXPORT WebContentsDelegate { const std::string& partition_id, SessionStorageNamespace* session_storage_namespace); + virtual void GetCustomWebContentsView( + WebContents* web_contents, + const GURL& target_url, + int opener_render_process_id, + int opener_render_frame_id, + content::WebContentsView** view, + content::RenderViewHostDelegateView** delegate_view) {} + // Notifies the delegate about the creation of a new WebContents. This // typically happens when popups are created. virtual void WebContentsCreated(WebContents* source_contents, diff --git content/public/browser/web_contents_observer.h content/public/browser/web_contents_observer.h index 3666e0357038..b82c54816894 100644 --- content/public/browser/web_contents_observer.h +++ content/public/browser/web_contents_observer.h @@ -610,6 +610,10 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener { // WebContents has gained/lost focus. virtual void OnFocusChangedInPage(FocusedNodeDetails* details) {} + // Notification that |render_frame_host| for this WebContents has gained + // focus. + virtual void OnFrameFocused(RenderFrameHost* render_frame_host) {} + // Notifies that the manifest URL for the main frame changed to // |manifest_url|. This will be invoked when a document with a manifest loads // or when the manifest URL changes (possibly to nothing). It is not invoked