diff options
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.cc | 30 |
1 files changed, 15 insertions, 15 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 7c4696ba8336..8c546ae78914 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,24 +1,24 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2022-07-22 17:30:31 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2022-08-31 12:19:35 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -97,7 +97,7 @@ +@@ -96,7 +96,7 @@ + #include "components/user_manager/user_manager.h" + #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" #endif -@@ -320,7 +320,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -285,7 +285,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( + #endif + } - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // If this key was registered by the user as a content editing hotkey, then // it is not reserved. - ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -556,7 +556,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo + auto* linux_ui = ui::LinuxUi::instance(); +@@ -530,7 +530,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -1122,7 +1122,7 @@ void BrowserCommandController::InitCommandState() { +@@ -1093,7 +1093,7 @@ void BrowserCommandController::InitCommandState() { #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. |