summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-ui_views_focus_focus__manager.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-ui_views_focus_focus__manager.cc')
-rw-r--r--www/chromium/files/patch-ui_views_focus_focus__manager.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/www/chromium/files/patch-ui_views_focus_focus__manager.cc b/www/chromium/files/patch-ui_views_focus_focus__manager.cc
index 38b7984f204b..9792a1ddd9d8 100644
--- a/www/chromium/files/patch-ui_views_focus_focus__manager.cc
+++ b/www/chromium/files/patch-ui_views_focus_focus__manager.cc
@@ -1,20 +1,20 @@
---- ui/views/focus/focus_manager.cc.orig 2021-01-18 21:29:49 UTC
+--- ui/views/focus/focus_manager.cc.orig 2021-03-12 23:57:48 UTC
+++ ui/views/focus/focus_manager.cc
-@@ -621,7 +621,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
- if (!focus_manager->IsAcceleratorRegistered(accelerator))
- return false;
+@@ -624,7 +624,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
// Processing an accelerator can delete things. Because we
// need these objects afterwards on Linux, save widget_ as weak pointer and
// save the close_on_deactivate property value of widget_delegate in a
-@@ -636,7 +636,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
- const bool accelerator_processed =
- focus_manager->ProcessAccelerator(accelerator);
+@@ -641,7 +641,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
// Need to manually close the bubble widget on Linux. On Linux when the
// bubble is shown, the main widget remains active. Because of that when
// focus is set to the main widget to process accelerator, the main widget