149 lines
6.2 KiB
Diff
149 lines
6.2 KiB
Diff
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
|
|
index b57520fe4254..0aa0a4a7c058 100644
|
|
--- content/browser/web_contents/web_contents_impl.cc
|
|
+++ content/browser/web_contents/web_contents_impl.cc
|
|
@@ -2066,15 +2066,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());
|
|
@@ -2894,6 +2901,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<WebContentsImpl> new_contents;
|
|
if (!is_guest) {
|
|
create_params.context = view_->GetNativeView();
|
|
@@ -6356,6 +6372,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
|
|
// This is an outermost WebContents.
|
|
SetAsFocusedWebContentsIfNecessary();
|
|
}
|
|
+
|
|
+ for (auto& observer : observers_)
|
|
+ observer.OnFrameFocused(node->current_frame_host());
|
|
}
|
|
|
|
void WebContentsImpl::DidCallFocus() {
|
|
diff --git content/public/browser/web_contents.cc content/public/browser/web_contents.cc
|
|
index d1d8ff84e1d2..e7cca94f8647 100644
|
|
--- content/public/browser/web_contents.cc
|
|
+++ content/public/browser/web_contents.cc
|
|
@@ -28,6 +28,8 @@ WebContents::CreateParams::CreateParams(BrowserContext* context,
|
|
renderer_initiated_creation(false),
|
|
desired_renderer_state(kOkayToHaveRendererProcess),
|
|
starting_sandbox_flags(blink::mojom::WebSandboxFlags::kNone),
|
|
+ view(nullptr),
|
|
+ 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 cf98180740c4..c4eba9a42702 100644
|
|
--- content/public/browser/web_contents.h
|
|
+++ content/public/browser/web_contents.h
|
|
@@ -82,9 +82,11 @@ class BrowserPluginGuestDelegate;
|
|
class InterstitialPage;
|
|
class RenderFrameHost;
|
|
class RenderViewHost;
|
|
+class RenderViewHostDelegateView;
|
|
class RenderWidgetHost;
|
|
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.
|
|
blink::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 c20a325ff586..874490e1c878 100644
|
|
--- content/public/browser/web_contents_delegate.h
|
|
+++ content/public/browser/web_contents_delegate.h
|
|
@@ -57,10 +57,12 @@ class ColorChooser;
|
|
class FileSelectListener;
|
|
class JavaScriptDialogManager;
|
|
class RenderFrameHost;
|
|
+class RenderViewHostDelegateView;
|
|
class RenderWidgetHost;
|
|
class SessionStorageNamespace;
|
|
class SiteInstance;
|
|
class WebContentsImpl;
|
|
+class WebContentsView;
|
|
struct ContextMenuParams;
|
|
struct DropData;
|
|
struct NativeWebKeyboardEvent;
|
|
@@ -324,6 +326,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 7bc8aae9b388..81cf86ef7990 100644
|
|
--- content/public/browser/web_contents_observer.h
|
|
+++ content/public/browser/web_contents_observer.h
|
|
@@ -585,6 +585,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
|