aboutsummaryrefslogtreecommitdiff
path: root/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc
diff options
context:
space:
mode:
authorRobert Nagy <rnagy@FreeBSD.org>2025-03-19 08:54:48 +0000
committerRobert Nagy <rnagy@FreeBSD.org>2025-03-19 08:55:06 +0000
commit9a673fbc1f30bb6238b520e5b8204374b97187cc (patch)
tree86d169078954740d4a4080bd7e462b6a2e92b6fc /www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc
parentc8cec9e75859da0c4859799e357ad85acc51a927 (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.cc41
1 files changed, 13 insertions, 28 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 1c00da0de56b..2c5591b853a3 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,4 +1,4 @@
---- chrome/browser/ui/browser_command_controller.cc.orig 2025-02-22 18:06:53 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig 2025-03-18 16:46:04 UTC
+++ chrome/browser/ui/browser_command_controller.cc
@@ -126,7 +126,7 @@
#include "components/user_manager/user_manager.h"
@@ -27,25 +27,16 @@
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
auto* linux_ui = ui::LinuxUi::instance();
-@@ -580,7 +580,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
-
- // TODO(crbug.com/40118868): 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)
- case IDC_MINIMIZE_WINDOW:
- browser_->window()->Minimize();
- break;
-@@ -592,7 +592,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -575,7 +575,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
break;
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- case IDC_USE_SYSTEM_TITLE_BAR: {
- PrefService* prefs = profile()->GetPrefs();
- prefs->SetBoolean(prefs::kUseCustomChromeFrame,
-@@ -798,7 +798,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+ case IDC_MINIMIZE_WINDOW:
+ browser_->window()->Minimize();
+ break;
+@@ -790,7 +790,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
break;
case IDC_CREATE_SHORTCUT:
base::RecordAction(base::UserMetricsAction("CreateShortcut"));
@@ -54,7 +45,7 @@
chrome::CreateDesktopShortcutForActiveWebContents(browser_);
#else
web_app::CreateWebAppFromCurrentWebContents(
-@@ -970,7 +970,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -957,7 +957,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
case IDC_CHROME_WHATS_NEW:
#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && \
@@ -63,22 +54,16 @@
ShowChromeWhatsNew(browser_);
break;
#else
-@@ -1285,12 +1285,12 @@ void BrowserCommandController::InitCommandState() {
+@@ -1264,7 +1264,7 @@ void BrowserCommandController::InitCommandState() {
+ command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_4, true);
+ command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_5, true);
#endif
- // TODO(crbug.com/40118868): 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)
command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true);
command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true);
command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true);
- #endif
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool use_system_title_bar = true;
- #if BUILDFLAG(IS_OZONE)
- use_system_title_bar = ui::OzonePlatform::GetInstance()
-@@ -1634,7 +1634,7 @@ void BrowserCommandController::UpdateCommandsForTabSta
+@@ -1614,7 +1614,7 @@ void BrowserCommandController::UpdateCommandsForTabSta
bool can_create_web_app = web_app::CanCreateWebApp(browser_);
command_updater_.UpdateCommandEnabled(IDC_INSTALL_PWA, can_create_web_app);