Differential D23984 Diff 69308 head/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
Changeset View
Changeset View
Standalone View
Standalone View
head/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2019-10-21 19:06:24 UTC | --- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2020-03-03 18:53:52 UTC | ||||
+++ chrome/browser/ui/views/frame/system_menu_model_builder.cc | +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc | ||||
@@ -80,7 +80,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM | @@ -62,7 +62,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM | ||||
void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow( | void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow( | ||||
ui::SimpleMenuModel* model) { | ui::SimpleMenuModel* model) { | ||||
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | ||||
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) | +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) | ||||
model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU); | model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU); | ||||
model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU); | model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU); | ||||
model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU); | model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU); | ||||
@@ -93,7 +93,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser | @@ -75,7 +75,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser | ||||
model->AddSeparator(ui::NORMAL_SEPARATOR); | model->AddSeparator(ui::NORMAL_SEPARATOR); | ||||
model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); | model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); | ||||
} | } | ||||
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | ||||
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) | +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) | ||||
model->AddSeparator(ui::NORMAL_SEPARATOR); | model->AddSeparator(ui::NORMAL_SEPARATOR); | ||||
model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR, | model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR, | ||||
IDS_SHOW_WINDOW_DECORATIONS_MENU); | IDS_SHOW_WINDOW_DECORATIONS_MENU); | ||||
@@ -131,7 +131,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo | @@ -113,7 +113,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo | ||||
model->AddSeparator(ui::NORMAL_SEPARATOR); | model->AddSeparator(ui::NORMAL_SEPARATOR); | ||||
model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); | model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); | ||||
} | } | ||||
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | ||||
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) | +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) | ||||
model->AddSeparator(ui::NORMAL_SEPARATOR); | model->AddSeparator(ui::NORMAL_SEPARATOR); | ||||
model->AddItemWithStringId(IDC_CLOSE_WINDOW, IDS_CLOSE); | model->AddItemWithStringId(IDC_CLOSE_WINDOW, IDS_CLOSE); | ||||
#endif | #endif |