Commit e227437e authored by Carlos IL's avatar Carlos IL Committed by Commit Bot

Add check for WebContentsModalDialogManager

This does not fix the issue when showing dialogs in a web contents
that does not have a WebContentsModalDialogManager, but let's us fail
in a controlled manner.

Bug: 999011
Change-Id: I57ab762d9c560b01b76f2550b513c7edfef95bd3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1779173Reviewed-by: default avatarMike Wittman <wittman@chromium.org>
Commit-Queue: Carlos IL <carlosil@chromium.org>
Cr-Commit-Position: refs/heads/master@{#692304}
parent dbb70071
...@@ -208,12 +208,12 @@ views::Widget* ShowWebModalDialogWithOverlayViews( ...@@ -208,12 +208,12 @@ views::Widget* ShowWebModalDialogWithOverlayViews(
views::Widget* CreateWebModalDialogViews(views::WidgetDelegate* dialog, views::Widget* CreateWebModalDialogViews(views::WidgetDelegate* dialog,
content::WebContents* web_contents) { content::WebContents* web_contents) {
DCHECK_EQ(ui::MODAL_TYPE_CHILD, dialog->GetModalType()); DCHECK_EQ(ui::MODAL_TYPE_CHILD, dialog->GetModalType());
web_modal::WebContentsModalDialogManager* manager =
web_modal::WebContentsModalDialogManager::FromWebContents(web_contents);
CHECK(manager);
return views::DialogDelegate::CreateDialogWidget( return views::DialogDelegate::CreateDialogWidget(
dialog, nullptr, dialog, nullptr,
web_modal::WebContentsModalDialogManager::FromWebContents(web_contents) manager->delegate()->GetWebContentsModalDialogHost()->GetHostView());
->delegate()
->GetWebContentsModalDialogHost()
->GetHostView());
} }
views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog, views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment