diff options
author | Rene Ladan <rene@FreeBSD.org> | 2021-04-06 08:40:01 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2021-04-06 08:46:52 +0000 |
commit | 1227b53ed1c53ea13efeac2bfe3fae5532c529ec (patch) | |
tree | 551daaabc2287f94c3b2d7b59c0cc2a235156540 /www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc | |
parent | a8416100c4e9b0dd5090c78d09ef6a94293b3c02 (diff) | |
download | ports-1227b53ed1c53ea13efeac2bfe3fae5532c529ec.tar.gz ports-1227b53ed1c53ea13efeac2bfe3fae5532c529ec.zip |
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc')
-rw-r--r-- | www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc index 8bf5135711bf..ca587eec42f1 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc @@ -1,29 +1,29 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2020-11-13 06:36:38 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2021-03-12 23:57:19 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc -@@ -63,7 +63,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM - - void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow( +@@ -70,7 +70,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser ui::SimpleMenuModel* model) { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) ++#if (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU); -@@ -78,7 +78,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser - model->AddSeparator(ui::NORMAL_SEPARATOR); - model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); +@@ -87,7 +87,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser } --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) ++#if (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR, IDS_SHOW_WINDOW_DECORATIONS_MENU); -@@ -116,7 +116,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo - model->AddSeparator(ui::NORMAL_SEPARATOR); - model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); +@@ -130,7 +130,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo } --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_CLOSE_WINDOW, IDS_CLOSE); #endif |