diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2024-06-26 06:11:27 +0000 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2024-06-26 15:34:47 +0000 |
| commit | b313ad21d659165dbf7eda701b81d5bf413ad752 (patch) | |
| tree | 2e5e02a358bbb3e2e4439e7528bf7f5e59caa0db /www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc | |
| parent | 78baa842a014c4d586d4ae6ab6586e5bf0494a3c (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 | 25 |
1 files changed, 17 insertions, 8 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 deb74337775e..a6a860d1d96a 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,6 +1,6 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -121,7 +121,7 @@ +@@ -127,7 +127,7 @@ #include "components/user_manager/user_manager.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/text_input_flags.h" #include "ui/linux/linux_ui.h" #endif -@@ -303,7 +303,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -309,7 +309,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } @@ -18,16 +18,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(); -@@ -555,7 +555,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -561,7 +561,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // 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; -@@ -567,7 +567,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -573,7 +573,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -36,9 +36,18 @@ case IDC_USE_SYSTEM_TITLE_BAR: { PrefService* prefs = profile()->GetPrefs(); prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -1234,12 +1234,12 @@ void BrowserCommandController::InitCommandState() { +@@ -767,7 +767,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo + break; + case IDC_CREATE_SHORTCUT: + base::RecordAction(base::UserMetricsAction("CreateShortcut")); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled(features::kShortcutsNotApps)) { + chrome::CreateDesktopShortcutForActiveWebContents(browser_); + } else { +@@ -1270,12 +1270,12 @@ void BrowserCommandController::InitCommandState() { #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // 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) |