summaryrefslogtreecommitdiff
path: root/chromium/components/web_modal
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-05-20 09:47:09 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-06-07 11:15:42 +0000
commit189d4fd8fad9e3c776873be51938cd31a42b6177 (patch)
tree6497caeff5e383937996768766ab3bb2081a40b2 /chromium/components/web_modal
parent8bc75099d364490b22f43a7ce366b366c08f4164 (diff)
downloadqtwebengine-chromium-189d4fd8fad9e3c776873be51938cd31a42b6177.tar.gz
BASELINE: Update Chromium to 90.0.4430.221
Change-Id: Iff4d9d18d2fcf1a576f3b1f453010f744a232920 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/web_modal')
-rw-r--r--chromium/components/web_modal/DIR_METADATA3
-rw-r--r--chromium/components/web_modal/OWNERS1
-rw-r--r--chromium/components/web_modal/web_contents_modal_dialog_manager.cc3
3 files changed, 5 insertions, 2 deletions
diff --git a/chromium/components/web_modal/DIR_METADATA b/chromium/components/web_modal/DIR_METADATA
new file mode 100644
index 00000000000..69976b6ce07
--- /dev/null
+++ b/chromium/components/web_modal/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail {
+ component: "UI>Browser>Core"
+}
diff --git a/chromium/components/web_modal/OWNERS b/chromium/components/web_modal/OWNERS
index f8ca2ece7b3..12a9b0975ce 100644
--- a/chromium/components/web_modal/OWNERS
+++ b/chromium/components/web_modal/OWNERS
@@ -1,2 +1 @@
wittman@chromium.org
-# COMPONENT: UI>Browser>Core
diff --git a/chromium/components/web_modal/web_contents_modal_dialog_manager.cc b/chromium/components/web_modal/web_contents_modal_dialog_manager.cc
index f9ec11d0a01..04fffc4b131 100644
--- a/chromium/components/web_modal/web_contents_modal_dialog_manager.cc
+++ b/chromium/components/web_modal/web_contents_modal_dialog_manager.cc
@@ -134,7 +134,8 @@ void WebContentsModalDialogManager::DidFinishNavigation(
// Close constrained windows if necessary.
if (!net::registry_controlled_domains::SameDomainOrHost(
- navigation_handle->GetPreviousURL(), navigation_handle->GetURL(),
+ navigation_handle->GetPreviousMainFrameURL(),
+ navigation_handle->GetURL(),
net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES))
CloseAllDialogs();
}