summaryrefslogtreecommitdiff
path: root/www/iridium/files/patch-ui_views_window_dialog__delegate.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/iridium/files/patch-ui_views_window_dialog__delegate.cc')
-rw-r--r--www/iridium/files/patch-ui_views_window_dialog__delegate.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/www/iridium/files/patch-ui_views_window_dialog__delegate.cc b/www/iridium/files/patch-ui_views_window_dialog__delegate.cc
index d3c99fcca7c6..b92881838304 100644
--- a/www/iridium/files/patch-ui_views_window_dialog__delegate.cc
+++ b/www/iridium/files/patch-ui_views_window_dialog__delegate.cc
@@ -1,11 +1,11 @@
---- ui/views/window/dialog_delegate.cc.orig 2019-03-11 22:01:19 UTC
+--- ui/views/window/dialog_delegate.cc.orig 2020-02-03 21:53:40 UTC
+++ ui/views/window/dialog_delegate.cc
-@@ -64,7 +64,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInit
- params.bounds = bounds;
- DialogDelegate* dialog = delegate->AsDialogDelegate();
+@@ -59,7 +59,7 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDeleg
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // static
+ bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) {
+-#if defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA)
// The new style doesn't support unparented dialogs on Linux desktop.
- if (dialog)
- dialog->supports_custom_frame_ &= parent != NULL;
+ return parent != nullptr;
+ #elif defined(OS_WIN)