123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415 |
- 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/android/document/document_web_contents_delegate.cc b/chrome/browser/android/document/document_web_contents_delegate.cc
- index 0e90487923c57c0570e73ef0f0e8c5acc2576932..20fece7e761c28d8d13f53de5b5b521a73f4f168 100644
- --- a/chrome/browser/android/document/document_web_contents_delegate.cc
- +++ b/chrome/browser/android/document/document_web_contents_delegate.cc
- @@ -46,8 +46,7 @@ bool DocumentWebContentsDelegate::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) {
- NOTREACHED();
- return true;
- }
- diff --git a/chrome/browser/android/document/document_web_contents_delegate.h b/chrome/browser/android/document/document_web_contents_delegate.h
- index 5b4d70991e19edcdfee731c56251932bf43e535f..4d996e3821410b2325ef85499f8c307c6e043b2a 100644
- --- a/chrome/browser/android/document/document_web_contents_delegate.h
- +++ b/chrome/browser/android/document/document_web_contents_delegate.h
- @@ -41,8 +41,7 @@ class DocumentWebContentsDelegate
- 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;
- };
-
- #endif // CHROME_BROWSER_ANDROID_DOCUMENT_DOCUMENT_WEB_CONTENTS_DELEGATE_H_
- diff --git a/chrome/browser/media/offscreen_tab.cc b/chrome/browser/media/offscreen_tab.cc
- index 27452df45433e4aeb7b9008f8e5b91dd4b5f50db..5c6f9936e6d3d2647d7efbc70efda8551c5516c7 100644
- --- a/chrome/browser/media/offscreen_tab.cc
- +++ b/chrome/browser/media/offscreen_tab.cc
- @@ -285,8 +285,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 faa684c429e8cd5817c043db48dcbea33c6c8782..8b5991bc8279585cc0749f6816aa8a03a2c4e558 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/ash_web_view_impl.cc b/chrome/browser/ui/ash/ash_web_view_impl.cc
- index 593cbe8038789e3b071ec9f5c243be6f0be629f0..18e5ade28bb966b35a6f69b2543768ac482d4730 100644
- --- a/chrome/browser/ui/ash/ash_web_view_impl.cc
- +++ b/chrome/browser/ui/ash/ash_web_view_impl.cc
- @@ -79,10 +79,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/ash_web_view_impl.h b/chrome/browser/ui/ash/ash_web_view_impl.h
- index e1adc822d8086b6c1b103a107923247cbb0aa7f2..2d2d65fa78d8fdccbe44aa1bf9b297e7038781c5 100644
- --- a/chrome/browser/ui/ash/ash_web_view_impl.h
- +++ b/chrome/browser/ui/ash/ash_web_view_impl.h
- @@ -46,8 +46,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) override;
- 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 6688ba8ba2fb7d930773144cdbc43f1f6fa2b685..22015c7b9b50e1264551ce226757f90e29191d8f 100644
- --- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc
- +++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc
- @@ -71,8 +71,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/browser.cc b/chrome/browser/ui/browser.cc
- index ace0c593debb46c9238e5708634fc6088a1bc715..31d5c0f00ae43706f16fc8615761e96eab31f1f3 100644
- --- a/chrome/browser/ui/browser.cc
- +++ b/chrome/browser/ui/browser.cc
- @@ -1770,12 +1770,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 5edda102ff59ccb30d2150a88e75e8fb65379fca..82aaa442bca9e7a5e57315ace0b1c62e40ec1d24 100644
- --- a/chrome/browser/ui/browser.h
- +++ b/chrome/browser/ui/browser.h
- @@ -808,8 +808,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 27b0f262235a58d546358ea12d7d7ea05f250c15..4f3cb2d63313703c98fd2149c07c60c95f263cdb 100644
- --- a/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc
- +++ b/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc
- @@ -202,8 +202,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 b6833e34c5840a4d3a545d1c4a44b2b08d7fc9ea..5ebc16a3545a73e58516cb0fbdddca43e789fd24 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> 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 ed23267cd9f28f4e02d8374177f0bb697547cc2a..a979719f75ab4c9b49775ec3df5eff13f4429a49 100644
- --- a/chrome/browser/ui/views/hats/hats_next_web_dialog.cc
- +++ b/chrome/browser/ui/views/hats/hats_next_web_dialog.cc
- @@ -70,8 +70,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 1911b0558fad1d5834befa98e57a978e6e0b72da..cb85515f79617a32e2809ad6eb7f55e4ecc36b3f 100644
- --- a/components/embedder_support/android/delegate/web_contents_delegate_android.cc
- +++ b/components/embedder_support/android/delegate/web_contents_delegate_android.cc
- @@ -170,14 +170,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 2930898b03d7b7ef86d13733cec3cbe84105c166..76625339f42a867c8b68840253e91648721c9343 100644
- --- a/components/embedder_support/android/delegate/web_contents_delegate_android.h
- +++ b/components/embedder_support/android/delegate/web_contents_delegate_android.h
- @@ -78,8 +78,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 2834e3ee5778185741779a473cf5157788a76cc5..64fcddc952065e574a84edd99e5b1b80febd3d26 100644
- --- a/components/offline_pages/content/background_loader/background_loader_contents.cc
- +++ b/components/offline_pages/content/background_loader/background_loader_contents.cc
- @@ -81,8 +81,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 c6bd5c19f8a7ceec17c9e32af5296a9617f3a619..02199b439fba7fdc617b7f7980d958b76d09c4e8 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;
-
- void AddNewContents(content::WebContents* source,
- std::unique_ptr<content::WebContents> new_contents,
- diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
- index d69e028b34ab4407abcdea3ece93db39926c587e..a82b571fdabe90771bc8f8ed4ae40df3085592c7 100644
- --- a/content/browser/web_contents/web_contents_impl.cc
- +++ b/content/browser/web_contents/web_contents_impl.cc
- @@ -3879,8 +3879,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 7bb1680553c405a9016cfd67eca5fa3c6439b692..3aa2cca04340098859e1072eaa80a46a8e0463b1 100644
- --- a/content/public/browser/web_contents_delegate.cc
- +++ b/content/public/browser/web_contents_delegate.cc
- @@ -134,8 +134,7 @@ bool WebContentsDelegate::IsWebContentsCreationOverridden(
- SiteInstance* source_site_instance,
- content::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 a998c64237a7ffd6583a33cd54fe3229196300a6..4f57227a9033f905be13bc5166d0324d495a6531 100644
- --- a/content/public/browser/web_contents_delegate.h
- +++ b/content/public/browser/web_contents_delegate.h
- @@ -318,8 +318,7 @@ class CONTENT_EXPORT WebContentsDelegate {
- SiteInstance* source_site_instance,
- content::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/extension_options/extension_options_guest.cc b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
- index bddbd37ca73369adb82dad5bb8b25f0ab2a7f878..9bf28cd7f926f41041f40d4bc0a497c8b8730b86 100644
- --- a/extensions/browser/guest_view/extension_options/extension_options_guest.cc
- +++ b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
- @@ -213,8 +213,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 7350382146178f58960a9bf68cd959076d2d9790..a70a94d14bdfa993feab60b8e4f32e1002cf38cc 100644
- --- a/extensions/browser/guest_view/extension_options/extension_options_guest.h
- +++ b/extensions/browser/guest_view/extension_options/extension_options_guest.h
- @@ -58,8 +58,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 56b6d5d28fe21a2bea723060ad48ee0134e814a2..a3da9c86c0018e7f4810feb73ca32896cd6ce93c 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
- @@ -402,8 +402,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 ef6faf317dd4168adf6fd530a7da0b80f9166dec..f401659a81d4aeaf71039d71eb8fec4844497334 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
- @@ -171,8 +171,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/engine/browser/frame_impl.cc b/fuchsia/engine/browser/frame_impl.cc
- index 424c5f89440dccc29f3431e034d0a4fd4f647a00..8d40d0bd30fc28e841eedb3f34be3c033db62449 100644
- --- a/fuchsia/engine/browser/frame_impl.cc
- +++ b/fuchsia/engine/browser/frame_impl.cc
- @@ -402,8 +402,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/engine/browser/frame_impl.h b/fuchsia/engine/browser/frame_impl.h
- index f2054bca778784c223beb02de150cfeb31c52907..53bf6bc205e9c631597bfbda46f4a0b5b4bb72ed 100644
- --- a/fuchsia/engine/browser/frame_impl.h
- +++ b/fuchsia/engine/browser/frame_impl.h
- @@ -307,8 +307,7 @@ class 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 899b8beabdf1131a08583470ace5b468576eeab6..21ab4ae22c54846af78518e897dc23ebe4ce8317 100644
- --- a/headless/lib/browser/headless_web_contents_impl.cc
- +++ b/headless/lib/browser/headless_web_contents_impl.cc
- @@ -177,8 +177,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 749200efec166e0c29402a3d5e079f2e94460363..2cbc96e911291fb0b31c3f4a1444ded0be4521f5 100644
- --- a/ui/views/controls/webview/web_dialog_view.cc
- +++ b/ui/views/controls/webview/web_dialog_view.cc
- @@ -427,8 +427,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 eb5c113cab56f28d3bca3ac722c6e2b1ed3b50e8..26263aec5b8e401d3fd79b898651b9635daa36d8 100644
- --- a/ui/views/controls/webview/web_dialog_view.h
- +++ b/ui/views/controls/webview/web_dialog_view.h
- @@ -155,8 +155,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,
|