aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-ui_views_widget_native__widget__aura.cc')
-rw-r--r--www/chromium/files/patch-ui_views_widget_native__widget__aura.cc19
1 files changed, 5 insertions, 14 deletions
diff --git a/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc b/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc
index 9c67324de548..dc70e2e58e3e 100644
--- a/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc
+++ b/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc
@@ -1,15 +1,15 @@
---- ui/views/widget/native_widget_aura.cc.orig 2021-05-12 22:06:47 UTC
+--- ui/views/widget/native_widget_aura.cc.orig 2021-07-19 18:45:44 UTC
+++ ui/views/widget/native_widget_aura.cc
-@@ -70,7 +70,7 @@
+@@ -69,7 +69,7 @@
#endif
#if BUILDFLAG(ENABLE_DESKTOP_AURA) && \
- (defined(OS_LINUX) || defined(OS_CHROMEOS))
+ (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD))
- #include "ui/views/linux_ui/linux_ui.h"
#include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h"
#endif
-@@ -1124,7 +1124,7 @@ void NativeWidgetAura::SetInitialFocus(ui::WindowShowS
+
+@@ -1133,7 +1133,7 @@ void NativeWidgetAura::SetInitialFocus(ui::WindowShowS
namespace {
#if BUILDFLAG(ENABLE_DESKTOP_AURA) && \
@@ -18,7 +18,7 @@
void CloseWindow(aura::Window* window) {
if (window) {
Widget* widget = Widget::GetWidgetForNativeView(window);
-@@ -1155,7 +1155,7 @@ void Widget::CloseAllSecondaryWidgets() {
+@@ -1164,7 +1164,7 @@ void Widget::CloseAllSecondaryWidgets() {
#endif
#if BUILDFLAG(ENABLE_DESKTOP_AURA) && \
@@ -27,12 +27,3 @@
DesktopWindowTreeHostLinux::CleanUpWindowList(CloseWindow);
#endif
}
-@@ -1168,7 +1168,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const
- }
-
- #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \
-- (defined(OS_LINUX) || defined(OS_CHROMEOS))
-+ (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD))
- const LinuxUI* linux_ui = LinuxUI::instance();
- if (linux_ui) {
- ui::NativeTheme* native_theme =