Commit 6916fceb authored by Darin Fisher's avatar Darin Fisher Committed by Chromium LUCI CQ

[Lacros] Align system menu to what is expected on Chrome OS

Change-Id: If66051dcd1da5b8b15fd54e0191dd52a9e751938
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2580905Reviewed-by: default avatarErik Chen <erikchen@chromium.org>
Commit-Queue: Darin Fisher <darin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#834992}
parent 30ca5fda
......@@ -8251,7 +8251,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
Set as default
</message>
<if expr="is_linux and not chromeos">
<if expr="is_linux and not chromeos and not lacros">
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
Minimize
</message>
......
......@@ -66,7 +66,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow(
ui::SimpleMenuModel* model) {
// 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)
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);
......@@ -83,7 +83,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow(
}
// 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)
model->AddSeparator(ui::NORMAL_SEPARATOR);
model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR,
IDS_SHOW_WINDOW_DECORATIONS_MENU);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment