aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
diff options
context:
space:
mode:
authorRobert Nagy <robert@openbsd.org>2022-06-18 05:51:42 +0000
committerRene Ladan <rene@FreeBSD.org>2022-06-22 08:02:35 +0000
commit80ffbf089df7cc8d4b4879e23f6816fc7e338f7f (patch)
tree23b8c15850649e788bdcc2a8b3ed62ff0d793988 /www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
parente408d5e4ec74b0d09aa3306a49065cac0c429427 (diff)
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc')
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc37
1 files changed, 5 insertions, 32 deletions
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
index b3fdff9f3d18..475c34166459 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
@@ -1,15 +1,6 @@
---- chrome/browser/ui/browser_command_controller.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/browser_command_controller.cc
-@@ -71,7 +71,7 @@
- #include "ui/base/ui_base_features.h"
- #include "ui/events/keycodes/keyboard_codes.h"
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/accessibility/accessibility_features.h"
- #endif
-
-@@ -96,7 +96,7 @@
+@@ -97,7 +97,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -18,7 +9,7 @@
#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
#endif
-@@ -287,7 +287,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
+@@ -288,7 +288,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -27,7 +18,7 @@
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
-@@ -523,7 +523,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -524,7 +524,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -36,16 +27,7 @@
case IDC_MINIMIZE_WINDOW:
browser_->window()->Minimize();
break;
-@@ -926,7 +926,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
- ExecuteUIDebugCommand(id, browser_);
- break;
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- case IDC_RUN_SCREEN_AI:
- RunScreenAi(browser_);
- break;
-@@ -1088,7 +1088,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -1087,7 +1087,7 @@ void BrowserCommandController::InitCommandState() {
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -54,12 +36,3 @@
command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true);
command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true);
command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true);
-@@ -1474,7 +1474,7 @@ void BrowserCommandController::UpdateCommandsForFullsc
- command_updater_.UpdateCommandEnabled(
- IDC_FOCUS_INACTIVE_POPUP_FOR_ACCESSIBILITY, main_not_fullscreen);
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- command_updater_.UpdateCommandEnabled(IDC_RUN_SCREEN_AI,
- features::IsScreenAIEnabled());
- #endif