aboutsummaryrefslogtreecommitdiff
path: root/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc
diff options
context:
space:
mode:
authorRobert Nagy <rnagy@FreeBSD.org>2024-02-04 20:51:55 +0000
committerRobert Nagy <rnagy@FreeBSD.org>2024-02-04 20:52:50 +0000
commita481ee1e98dd46154b90787898cc11d7427472f0 (patch)
treed4af661dfe3cc74d7d4f226706d16e7af144dd27 /www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc
parent98816358fdd22f1d58a71b25f0b357314901a022 (diff)
Diffstat (limited to 'www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc')
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc
index a0c4b731fcc9..deb74337775e 100644
--- a/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc
@@ -1,15 +1,15 @@
---- chrome/browser/ui/browser_command_controller.cc.orig 2023-11-22 14:00:11 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig 2024-02-04 14:46:08 UTC
+++ chrome/browser/ui/browser_command_controller.cc
-@@ -125,7 +125,7 @@
+@@ -121,7 +121,7 @@
#include "components/user_manager/user_manager.h"
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/base/ime/text_input_flags.h"
#include "ui/linux/linux_ui.h"
#endif
-
-@@ -306,7 +306,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
+@@ -303,7 +303,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
#endif
}
@@ -18,7 +18,7 @@
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
auto* linux_ui = ui::LinuxUi::instance();
-@@ -557,7 +557,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -555,7 +555,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;
-@@ -569,7 +569,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -567,7 +567,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
break;
#endif
@@ -36,7 +36,7 @@
case IDC_USE_SYSTEM_TITLE_BAR: {
PrefService* prefs = profile()->GetPrefs();
prefs->SetBoolean(prefs::kUseCustomChromeFrame,
-@@ -1215,12 +1215,12 @@ void BrowserCommandController::InitCommandState() {
+@@ -1234,12 +1234,12 @@ void BrowserCommandController::InitCommandState() {
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.