[Merge to M90] cros: Make Move to Desks menu not process mnemonics.

Currently ampersands aren't being rendered for Move to Desks menu's
labels. This is because the ampersands are being processed as
mnemonics.

This CL fixes this by overriding MenuModel::MayHaveMnemonicsAt() and
returning false.

(cherry picked from commit 4decb5c)

Test: manual
Bug: 1184307
Change-Id: Ic75e8c3894e47bfc942ee134a82113859e567b7c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2733514
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Jeremy Chinsen <chinsenj@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#859602}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2739766
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/4430@{#156}
Cr-Branched-From: e5ce7dc-refs/heads/master@{#857950}

chrome/browser/ui/toolbar/move_to_desks_menu_model.cc

@@ -29,6 +29,12 @@ MoveToDesksMenuModel::MoveToDesksMenuModel(
     AddCheckItem(IDC_MOVE_TO_DESK_1 + i, base::string16());
 }
 
+bool MoveToDesksMenuModel::MayHaveMnemonicsAt(int index) const {
+  // If the label is a user-created desk name, the user might have ampersands so
+  // don't process mnemonics for them.
+  return (index == assign_to_all_desks_item_index_);
+}
+
 bool MoveToDesksMenuModel::IsVisibleAt(int index) const {
   if (index == assign_to_all_desks_item_index_)
     return true;

chrome/browser/ui/toolbar/move_to_desks_menu_model.h

@@ -23,6 +23,7 @@ class MoveToDesksMenuModel : public ui::SimpleMenuModel {
   ~MoveToDesksMenuModel() override = default;
 
   // SimpleMenuModel:
+  bool MayHaveMnemonicsAt(int index) const override;
   bool IsVisibleAt(int index) const override;
   base::string16 GetLabelAt(int index) const override;
   bool IsItemCheckedAt(int index) const override;