123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423 |
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: Andy Locascio <[email protected]>
- Date: Wed, 9 Sep 2020 16:56:06 -0700
- Subject: chore: provide IsWebContentsCreationOverridden with full params
- Pending upstream patch, this gives us fuller access to the window.open params
- so that we will be able to decide whether to cancel it or not.
- diff --git a/chrome/browser/media/offscreen_tab.cc b/chrome/browser/media/offscreen_tab.cc
- index bfcdf050e603b953d15a0898200c8f031a1f84c6..b1f163b6da4d2197d404a5a0fbd31a5b346d3d69 100644
- --- a/chrome/browser/media/offscreen_tab.cc
- +++ b/chrome/browser/media/offscreen_tab.cc
- @@ -286,8 +286,7 @@ bool OffscreenTab::IsWebContentsCreationOverridden(
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) {
- + const content::mojom::CreateNewWindowParams& params) {
- // Disallow creating separate WebContentses. The WebContents implementation
- // uses this to spawn new windows/tabs, which is also not allowed for
- // offscreen tabs.
- diff --git a/chrome/browser/media/offscreen_tab.h b/chrome/browser/media/offscreen_tab.h
- index 0163968067f2607507493a5e0816aa814de3ba0b..34b94af6a4e3f031a35520fde4173e186ebec0b7 100644
- --- a/chrome/browser/media/offscreen_tab.h
- +++ b/chrome/browser/media/offscreen_tab.h
- @@ -107,8 +107,7 @@ class OffscreenTab final : public ProfileObserver,
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) final;
- + const content::mojom::CreateNewWindowParams& params) override;
- void EnterFullscreenModeForTab(
- content::RenderFrameHost* requesting_frame,
- const blink::mojom::FullscreenOptions& options) final;
- diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc
- index 28cd699814f32a7a569d63936b9544567a66d9c4..fd461fa448d983481dc4c0c7d03b1945a7a13c46 100644
- --- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc
- +++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc
- @@ -79,8 +79,7 @@ class ChromeKeyboardContentsDelegate : public content::WebContentsDelegate,
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) override {
- + const content::mojom::CreateNewWindowParams& params) override {
- return true;
- }
-
- diff --git a/chrome/browser/ui/ash/web_view/ash_web_view_impl.cc b/chrome/browser/ui/ash/web_view/ash_web_view_impl.cc
- index 05fa4a72491658b542804912b0509089b9604e20..1304ed22fe3d1ae080cff3d085567c3d873daf51 100644
- --- a/chrome/browser/ui/ash/web_view/ash_web_view_impl.cc
- +++ b/chrome/browser/ui/ash/web_view/ash_web_view_impl.cc
- @@ -118,10 +118,9 @@ bool AshWebViewImpl::IsWebContentsCreationOverridden(
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) {
- + const content::mojom::CreateNewWindowParams& params) {
- if (params_.suppress_navigation) {
- - NotifyDidSuppressNavigation(target_url,
- + NotifyDidSuppressNavigation(params.target_url,
- WindowOpenDisposition::NEW_FOREGROUND_TAB,
- /*from_user_gesture=*/true);
- return true;
- diff --git a/chrome/browser/ui/ash/web_view/ash_web_view_impl.h b/chrome/browser/ui/ash/web_view/ash_web_view_impl.h
- index b078a4a06c7b3f767e2e01f0bef2ba440f729620..0459568581a3073333ae6afabd3680f25b9196e4 100644
- --- a/chrome/browser/ui/ash/web_view/ash_web_view_impl.h
- +++ b/chrome/browser/ui/ash/web_view/ash_web_view_impl.h
- @@ -59,8 +59,7 @@ class AshWebViewImpl : public ash::AshWebView,
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) override;
- + const content::mojom::CreateNewWindowParams& params) override;
- content::WebContents* OpenURLFromTab(
- content::WebContents* source,
- const content::OpenURLParams& params,
- diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
- index e87612be406274364fd125e7e89e803aa21702d8..0964949aaaec52cbc4db124e345db458df57c040 100644
- --- a/chrome/browser/ui/browser.cc
- +++ b/chrome/browser/ui/browser.cc
- @@ -2110,12 +2110,11 @@ bool Browser::IsWebContentsCreationOverridden(
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) {
- + const content::mojom::CreateNewWindowParams& params) {
- return window_container_type ==
- content::mojom::WindowContainerType::BACKGROUND &&
- ShouldCreateBackgroundContents(source_site_instance, opener_url,
- - frame_name);
- + params.frame_name);
- }
-
- WebContents* Browser::CreateCustomWebContents(
- diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
- index 86ea151056ca1e565f2c636aeb23fdff269e8e9a..244cabf50f63d061cba99cfefc2cf992e365b433 100644
- --- a/chrome/browser/ui/browser.h
- +++ b/chrome/browser/ui/browser.h
- @@ -970,8 +970,7 @@ class Browser : public TabStripModelObserver,
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) override;
- + const content::mojom::CreateNewWindowParams& params) override;
- content::WebContents* CreateCustomWebContents(
- content::RenderFrameHost* opener,
- content::SiteInstance* source_site_instance,
- diff --git a/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc b/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc
- index 58506f1c2e9e20c77cd26172e6b52e71ffb8e515..052c00d29e3f517440e28f56cf61fd33655e2804 100644
- --- a/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc
- +++ b/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc
- @@ -203,8 +203,7 @@ bool PresentationReceiverWindowController::IsWebContentsCreationOverridden(
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) {
- + const content::mojom::CreateNewWindowParams& params) {
- // Disallow creating separate WebContentses. The WebContents implementation
- // uses this to spawn new windows/tabs, which is also not allowed for
- // local presentations.
- diff --git a/chrome/browser/ui/media_router/presentation_receiver_window_controller.h b/chrome/browser/ui/media_router/presentation_receiver_window_controller.h
- index ca72b324bf7c3b81ac94b53f0ff454d2df177950..d60ef3075d126e2bbd50c8469f2bf67cfa05c6f7 100644
- --- a/chrome/browser/ui/media_router/presentation_receiver_window_controller.h
- +++ b/chrome/browser/ui/media_router/presentation_receiver_window_controller.h
- @@ -105,8 +105,7 @@ class PresentationReceiverWindowController final
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) override;
- + const content::mojom::CreateNewWindowParams& params) override;
-
- // The profile used for the presentation.
- raw_ptr<Profile, DanglingUntriaged> otr_profile_;
- diff --git a/chrome/browser/ui/views/hats/hats_next_web_dialog.cc b/chrome/browser/ui/views/hats/hats_next_web_dialog.cc
- index 520674b0a5061057fa4b769ba5db93da81531d3f..b364e20f7bba27f3f167aa201e26c9160f1128cd 100644
- --- a/chrome/browser/ui/views/hats/hats_next_web_dialog.cc
- +++ b/chrome/browser/ui/views/hats/hats_next_web_dialog.cc
- @@ -97,8 +97,7 @@ class HatsNextWebDialog::HatsWebView : public views::WebView {
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) override {
- + const content::mojom::CreateNewWindowParams& params) override {
- return true;
- }
- content::WebContents* CreateCustomWebContents(
- diff --git a/components/embedder_support/android/delegate/web_contents_delegate_android.cc b/components/embedder_support/android/delegate/web_contents_delegate_android.cc
- index bcc4841d7f953805f615b3fe5dd252216aa5e482..76a88284aa409b1458ce5f723a1445bd4b184573 100644
- --- a/components/embedder_support/android/delegate/web_contents_delegate_android.cc
- +++ b/components/embedder_support/android/delegate/web_contents_delegate_android.cc
- @@ -183,14 +183,13 @@ bool WebContentsDelegateAndroid::IsWebContentsCreationOverridden(
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) {
- + const content::mojom::CreateNewWindowParams& params) {
- JNIEnv* env = AttachCurrentThread();
- ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
- if (obj.is_null())
- return false;
- ScopedJavaLocalRef<jobject> java_gurl =
- - url::GURLAndroid::FromNativeGURL(env, target_url);
- + url::GURLAndroid::FromNativeGURL(env, params.target_url.spec());
- return !Java_WebContentsDelegateAndroid_shouldCreateWebContents(env, obj,
- java_gurl);
- }
- diff --git a/components/embedder_support/android/delegate/web_contents_delegate_android.h b/components/embedder_support/android/delegate/web_contents_delegate_android.h
- index 6c89a03712b9449e1a7b0e38ed9d019b30029c15..50b324ef3f1163e462ad145e58b42bf3fd053a0a 100644
- --- a/components/embedder_support/android/delegate/web_contents_delegate_android.h
- +++ b/components/embedder_support/android/delegate/web_contents_delegate_android.h
- @@ -82,8 +82,7 @@ class WebContentsDelegateAndroid : public content::WebContentsDelegate {
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) override;
- + const content::mojom::CreateNewWindowParams& params) override;
- void CloseContents(content::WebContents* source) override;
- void SetContentsBounds(content::WebContents* source,
- const gfx::Rect& bounds) override;
- diff --git a/components/offline_pages/content/background_loader/background_loader_contents.cc b/components/offline_pages/content/background_loader/background_loader_contents.cc
- index 072e7d0dde701a8f2d1de2704c8a056363324390..9e5ace2b1f32d5e5c542439f5365f9d9458cbf37 100644
- --- a/components/offline_pages/content/background_loader/background_loader_contents.cc
- +++ b/components/offline_pages/content/background_loader/background_loader_contents.cc
- @@ -85,8 +85,7 @@ bool BackgroundLoaderContents::IsWebContentsCreationOverridden(
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) {
- + const content::mojom::CreateNewWindowParams& params) {
- // Background pages should not create other webcontents/tabs.
- return true;
- }
- diff --git a/components/offline_pages/content/background_loader/background_loader_contents.h b/components/offline_pages/content/background_loader/background_loader_contents.h
- index c6838c83ef971b88769b1f3fba8095025ae25464..2da6a4e08340e72ba7de5d03444c2f17250c5eca 100644
- --- a/components/offline_pages/content/background_loader/background_loader_contents.h
- +++ b/components/offline_pages/content/background_loader/background_loader_contents.h
- @@ -66,8 +66,7 @@ class BackgroundLoaderContents : public content::WebContentsDelegate {
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) override;
- + const content::mojom::CreateNewWindowParams& params) override;
-
- content::WebContents* AddNewContents(
- content::WebContents* source,
- diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
- index 76d396192337ad3b3046c6eb80c14a7d4a54ac8c..cc2e4302ad121d658bb43af1014b6af42a62d47a 100644
- --- a/content/browser/web_contents/web_contents_impl.cc
- +++ b/content/browser/web_contents/web_contents_impl.cc
- @@ -4676,8 +4676,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
-
- if (delegate_ && delegate_->IsWebContentsCreationOverridden(
- source_site_instance, params.window_container_type,
- - opener->GetLastCommittedURL(), params.frame_name,
- - params.target_url)) {
- + opener->GetLastCommittedURL(), params)) {
- auto* web_contents_impl =
- static_cast<WebContentsImpl*>(delegate_->CreateCustomWebContents(
- opener, source_site_instance, is_new_browsing_instance,
- diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
- index 94202a07c8774a9ad62938506b22ea3f72916372..3069d732ed336fdaf8fed231bdd0407d0a1b2f75 100644
- --- a/content/public/browser/web_contents_delegate.cc
- +++ b/content/public/browser/web_contents_delegate.cc
- @@ -152,8 +152,7 @@ bool WebContentsDelegate::IsWebContentsCreationOverridden(
- SiteInstance* source_site_instance,
- mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) {
- + const mojom::CreateNewWindowParams& params) {
- return false;
- }
-
- diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
- index cbec82fe1fbc43c188ac9c0cf318ee49aa83c503..9daed06017f4a586e34f1e47dc85b9e6e5136097 100644
- --- a/content/public/browser/web_contents_delegate.h
- +++ b/content/public/browser/web_contents_delegate.h
- @@ -345,8 +345,7 @@ class CONTENT_EXPORT WebContentsDelegate {
- SiteInstance* source_site_instance,
- mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url);
- + const mojom::CreateNewWindowParams& params);
-
- // Allow delegate to creates a custom WebContents when
- // WebContents::CreateNewWindow() is called. This function is only called
- diff --git a/extensions/browser/guest_view/app_view/app_view_guest.cc b/extensions/browser/guest_view/app_view/app_view_guest.cc
- index 7168904a792aedeea0249a1bc38718da06a43c04..f69143c9554f74709edbb5ac80c50083860e8856 100644
- --- a/extensions/browser/guest_view/app_view/app_view_guest.cc
- +++ b/extensions/browser/guest_view/app_view/app_view_guest.cc
- @@ -142,8 +142,7 @@ bool AppViewGuest::IsWebContentsCreationOverridden(
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) {
- + const content::mojom::CreateNewWindowParams& params) {
- return true;
- }
-
- diff --git a/extensions/browser/guest_view/app_view/app_view_guest.h b/extensions/browser/guest_view/app_view/app_view_guest.h
- index cb4241744b7c8ee4803de5ff5ccdefcae61cb02f..390ff1e3840f245b302aad460fc00cb4ea3e68b2 100644
- --- a/extensions/browser/guest_view/app_view/app_view_guest.h
- +++ b/extensions/browser/guest_view/app_view/app_view_guest.h
- @@ -10,6 +10,7 @@
- #include "base/containers/id_map.h"
- #include "base/values.h"
- #include "components/guest_view/browser/guest_view.h"
- +#include "content/common/frame.mojom-shared.h"
- #include "extensions/browser/guest_view/app_view/app_view_guest_delegate.h"
- #include "extensions/browser/lazy_context_task_queue.h"
-
- @@ -73,8 +74,7 @@ class AppViewGuest : public guest_view::GuestView<AppViewGuest> {
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) final;
- + const content::mojom::CreateNewWindowParams& params) final;
- content::WebContents* CreateCustomWebContents(
- content::RenderFrameHost* opener,
- content::SiteInstance* source_site_instance,
- diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.cc b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
- index 0eb1b7b778c139971601a14cef729be6fdf5c247..3491662f5eb6131e6d4a6cd525e6ba951ac91e00 100644
- --- a/extensions/browser/guest_view/extension_options/extension_options_guest.cc
- +++ b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
- @@ -221,8 +221,7 @@ bool ExtensionOptionsGuest::IsWebContentsCreationOverridden(
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) {
- + const content::mojom::CreateNewWindowParams& params) {
- // This method handles opening links from within the guest. Since this guest
- // view is used for displaying embedded extension options, we want any
- // external links to be opened in a new tab, not in a new guest view so we
- diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.h b/extensions/browser/guest_view/extension_options/extension_options_guest.h
- index 2ee922084c82edb7e49ec1c894b517b88f56f54d..9c12c8e9bab2ac59b16cb4a638e099cafc4cb36f 100644
- --- a/extensions/browser/guest_view/extension_options/extension_options_guest.h
- +++ b/extensions/browser/guest_view/extension_options/extension_options_guest.h
- @@ -66,8 +66,7 @@ class ExtensionOptionsGuest
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) final;
- + const content::mojom::CreateNewWindowParams& params) final;
- content::WebContents* CreateCustomWebContents(
- content::RenderFrameHost* opener,
- content::SiteInstance* source_site_instance,
- diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
- index 6c8040666b5203f9d2cd1f87cb730680483942c3..5a48581859f36a2c2a3925d44fcae0b07096bae4 100644
- --- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
- +++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
- @@ -389,8 +389,7 @@ bool MimeHandlerViewGuest::IsWebContentsCreationOverridden(
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) {
- + const content::mojom::CreateNewWindowParams& params) {
- return true;
- }
-
- diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
- index f0b71aba6dfb4682ce2e5b4c834b2526dcacb75c..d4b1857ca468ff97914d91d0c31298b73577547f 100644
- --- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
- +++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
- @@ -177,8 +177,7 @@ class MimeHandlerViewGuest
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) override;
- + const content::mojom::CreateNewWindowParams& params) override;
- content::WebContents* CreateCustomWebContents(
- content::RenderFrameHost* opener,
- content::SiteInstance* source_site_instance,
- diff --git a/fuchsia_web/webengine/browser/frame_impl.cc b/fuchsia_web/webengine/browser/frame_impl.cc
- index 2052ea2d325cf7b6c4c831d92fc493528746d343..04949a2c52feef18f21e10e8f4c5dcea38042b5e 100644
- --- a/fuchsia_web/webengine/browser/frame_impl.cc
- +++ b/fuchsia_web/webengine/browser/frame_impl.cc
- @@ -574,8 +574,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) {
- + const content::mojom::CreateNewWindowParams& params) {
- // Specify a generous upper bound for unacknowledged popup windows, so that we
- // can catch bad client behavior while not interfering with normal operation.
- constexpr size_t kMaxPendingWebContentsCount = 10;
- diff --git a/fuchsia_web/webengine/browser/frame_impl.h b/fuchsia_web/webengine/browser/frame_impl.h
- index 6d1f959d85f7c96d5d9ac84d4ae7831bec5cc706..682ff6a2f4cbde454c1ab06db43dd1281275dc14 100644
- --- a/fuchsia_web/webengine/browser/frame_impl.h
- +++ b/fuchsia_web/webengine/browser/frame_impl.h
- @@ -306,8 +306,7 @@ class WEB_ENGINE_EXPORT FrameImpl : public fuchsia::web::Frame,
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) override;
- + const content::mojom::CreateNewWindowParams& params) override;
- void WebContentsCreated(content::WebContents* source_contents,
- int opener_render_process_id,
- int opener_render_frame_id,
- diff --git a/headless/lib/browser/headless_web_contents_impl.cc b/headless/lib/browser/headless_web_contents_impl.cc
- index 0b9e6f37e0a5fcf1c4a1871f6750708abc5d0a1c..eb30d03da8dfa5e1a701f2b871bdfe9879a59e75 100644
- --- a/headless/lib/browser/headless_web_contents_impl.cc
- +++ b/headless/lib/browser/headless_web_contents_impl.cc
- @@ -197,8 +197,7 @@ class HeadlessWebContentsImpl::Delegate : public content::WebContentsDelegate {
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) override {
- + const content::mojom::CreateNewWindowParams& params) override {
- return headless_web_contents_->browser_context()
- ->options()
- ->block_new_web_contents();
- diff --git a/ui/views/controls/webview/web_dialog_view.cc b/ui/views/controls/webview/web_dialog_view.cc
- index fde8b6ded980b38cfbeb44acfd5f8c6b05b5fef8..7f6e2e4b4b413014e42aa428477d151b41fc4503 100644
- --- a/ui/views/controls/webview/web_dialog_view.cc
- +++ b/ui/views/controls/webview/web_dialog_view.cc
- @@ -449,8 +449,7 @@ bool WebDialogView::IsWebContentsCreationOverridden(
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) {
- + const content::mojom::CreateNewWindowParams& params) {
- if (delegate_)
- return delegate_->HandleShouldOverrideWebContentsCreation();
- return false;
- diff --git a/ui/views/controls/webview/web_dialog_view.h b/ui/views/controls/webview/web_dialog_view.h
- index 5ffd43b4907b7083c5fe0eb30279c75aac1a1800..2caa4140f2dca8c81e24d3738800fc0bce40287a 100644
- --- a/ui/views/controls/webview/web_dialog_view.h
- +++ b/ui/views/controls/webview/web_dialog_view.h
- @@ -167,8 +167,7 @@ class WEBVIEW_EXPORT WebDialogView : public ClientView,
- content::SiteInstance* source_site_instance,
- content::mojom::WindowContainerType window_container_type,
- const GURL& opener_url,
- - const std::string& frame_name,
- - const GURL& target_url) override;
- + const content::mojom::CreateNewWindowParams& params) override;
- void RequestMediaAccessPermission(
- content::WebContents* web_contents,
- const content::MediaStreamRequest& request,
|