diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2023-07-25 06:32:19 +0000 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2023-07-25 10:39:06 +0000 |
| commit | 2f85e0aed6882f5be23adf89be70ce5f327d3373 (patch) | |
| tree | 3ef44960af9cc5ef7a05ed9dc3378cd2540ea68c /www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc | |
| parent | 98ea9470f43d8428a55cbb9374fb2c0f0fc98f79 (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.cc | 27 |
1 files changed, 21 insertions, 6 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 21534d6288a0..9f224b5c8293 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,7 +1,7 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2023-04-22 17:45:15 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2023-07-24 14:27:53 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -104,7 +104,7 @@ - #include "components/user_manager/user_manager.h" +@@ -119,7 +119,7 @@ + #define ENABLED_VLOG_LEVEL 1 #endif -#if BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -293,7 +293,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -310,7 +310,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(); -@@ -545,7 +545,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -561,7 +561,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,16 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -1104,7 +1104,7 @@ void BrowserCommandController::InitCommandState() { +@@ -573,7 +573,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, +@@ -1175,12 +1175,12 @@ void BrowserCommandController::InitCommandState() { #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,3 +45,9 @@ 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() |