diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-05-12 15:59:20 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-05-25 06:57:22 +0000 |
| commit | f7eaed5286974984ba5f9e3189d8f49d03e99f81 (patch) | |
| tree | caed19b2af2024f35449fb0b781d0a25e09d4f8f /chromium/components/constrained_window | |
| parent | 9729c4479fe23554eae6e6dd1f30ff488f470c84 (diff) | |
| download | qtwebengine-chromium-f7eaed5286974984ba5f9e3189d8f49d03e99f81.tar.gz | |
BASELINE: Update Chromium to 100.0.4896.167
Change-Id: I98cbeb5d7543d966ffe04d8cefded0c493a11333
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/constrained_window')
| -rw-r--r-- | chromium/components/constrained_window/constrained_window_views.cc | 18 | ||||
| -rw-r--r-- | chromium/components/constrained_window/constrained_window_views_unittest.cc | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/chromium/components/constrained_window/constrained_window_views.cc b/chromium/components/constrained_window/constrained_window_views.cc index 62b2d18fc4c..d662221bcc6 100644 --- a/chromium/components/constrained_window/constrained_window_views.cc +++ b/chromium/components/constrained_window/constrained_window_views.cc @@ -21,6 +21,7 @@ #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_observer.h" #include "ui/views/window/dialog_delegate.h" +#include "url/gurl.h" #if defined(USE_OZONE) #include "ui/ozone/public/ozone_platform.h" @@ -194,11 +195,16 @@ views::Widget* CreateWebModalDialogViews(views::WidgetDelegate* dialog, DCHECK_EQ(ui::MODAL_TYPE_CHILD, dialog->GetModalType()); web_modal::WebContentsModalDialogManager* manager = web_modal::WebContentsModalDialogManager::FromWebContents(web_contents); - LOG_IF(FATAL, !manager) << "CreateWebModalDialogViews without a manager" - << ", scheme=" - << web_contents->GetLastCommittedURL().scheme_piece() - << ", host=" - << web_contents->GetLastCommittedURL().host_piece(); + + // TODO(http://crbug/1273287): Drop "if" and DEBUG_ALIAS_FOR_GURL after fix. + if (!manager) { + const GURL& url = web_contents->GetLastCommittedURL(); + DEBUG_ALIAS_FOR_GURL(url_alias, url); + LOG_IF(FATAL, !manager) + << "CreateWebModalDialogViews without a manager" + << ", scheme=" << url.scheme_piece() << ", host=" << url.host_piece(); + } + return views::DialogDelegate::CreateDialogWidget( dialog, nullptr, manager->delegate()->GetWebContentsModalDialogHost()->GetHostView()); @@ -223,7 +229,7 @@ views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog, bool requires_positioning = dialog->use_custom_frame(); -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) // On Mac, window modal dialogs are displayed as sheets, so their position is // managed by the parent window. requires_positioning = false; diff --git a/chromium/components/constrained_window/constrained_window_views_unittest.cc b/chromium/components/constrained_window/constrained_window_views_unittest.cc index 48992147bc8..47721c7d0a5 100644 --- a/chromium/components/constrained_window/constrained_window_views_unittest.cc +++ b/chromium/components/constrained_window/constrained_window_views_unittest.cc @@ -202,7 +202,7 @@ TEST_F(ConstrainedWindowViewsTest, MaximumWebContentsDialogSize) { // Ensure CreateBrowserModalDialogViews() works correctly with a null parent. // Flaky on Win10. https://crbug.com/1009182 -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) #define MAYBE_NullModalParent DISABLED_NullModalParent #else #define MAYBE_NullModalParent NullModalParent |