ui: use literal commas and periods in accelerators on Mac

That is, accelerators should read ",", not "Comma".

Bug: 867732
Change-Id: I7dec0af8475b420cbc4e793fecc823378b04f3ad
Reviewed-on: https://chromium-review.googlesource.com/1151649Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578411}

ui/base/accelerators/accelerator.cc

@@ -348,12 +348,15 @@ base::string16 Accelerator::KeyCodeToName(KeyboardCode key_code) const {
     case VKEY_F11:
       string_id = IDS_APP_F11_KEY;
       break;
+#if !defined(OS_MACOSX)
+    // On Mac, commas and periods are used literally in accelerator text.
     case VKEY_OEM_COMMA:
       string_id = IDS_APP_COMMA_KEY;
       break;
     case VKEY_OEM_PERIOD:
       string_id = IDS_APP_PERIOD_KEY;
       break;
+#endif
     case VKEY_MEDIA_NEXT_TRACK:
       string_id = IDS_APP_MEDIA_NEXT_TRACK_KEY;
       break;

ui/base/accelerators/accelerator_unittest.cc

@@ -50,6 +50,8 @@ TEST(AcceleratorTest, MAYBE_GetShortcutText) {
   } keys[] = {
     {VKEY_Q, EF_CONTROL_DOWN | EF_SHIFT_DOWN, "Ctrl+Shift+Q", "\u2303\u21e7Q"},
     {VKEY_A, EF_ALT_DOWN | EF_SHIFT_DOWN, "Alt+Shift+A", "\u2325\u21e7A"},
+    // Regression test for https://crbug.com/867732:
+    {VKEY_OEM_COMMA, EF_CONTROL_DOWN, "Ctrl+Comma", "\u2303,"},
 #if defined(OS_MACOSX)
     {VKEY_T, EF_COMMAND_DOWN | EF_CONTROL_DOWN, nullptr, "\u2303\u2318T"},
 #endif