Move Voice Interaction shortcut to accelerator_controller.cc

chrome/browser/ui/webui/chromeos/keyboard_overlay_ui_browsertest.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/accelerators/accelerator_table.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 41 matching lines @@
   return is_display_ui_scaling_enabled;
 }
 
 // Skip some accelerators in the tests:
 // 1. If the accelerator has no modifier, i.e. ui::EF_NONE, or for "Caps
 // Lock", such as ui::VKEY_MENU and ui::VKEY_LWIN, the logic to show it on
 // the keyboard overlay is not by the mapping of
 // keyboardOverlayData['shortcut'], so it can not be tested by this test.
 // 2. If it has debug modifiers: ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN |
 // ui::EF_SHIFT_DOWN
+// 3. If the shortcut action is device specific so it should not be shown
+// on the keyboard overlay, i.e. START_VOICE_INTERACTION.
 bool ShouldSkip(const ash::AcceleratorData& accelerator) {
   return accelerator.keycode == ui::VKEY_MENU ||
          accelerator.keycode == ui::VKEY_LWIN ||
          accelerator.modifiers == ui::EF_NONE ||
          accelerator.modifiers ==
-             (ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN);
+             (ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN) ||
+         accelerator.action == ash::START_VOICE_INTERACTION;
 }
 
 std::string KeyboardCodeToLabel(const ash::AcceleratorData& accelerator,
                                 content::WebContents* web_contents) {
   std::string label;
   EXPECT_TRUE(content::ExecuteScriptAndExtractString(
       web_contents,
       "domAutomationController.send("
       "  (function(number) {"
       "       if (!!KEYCODE_TO_LABEL[number]) {"
@@ skipping 86 matching lines @@
 
     const std::string shortcut = GenerateShortcutKey(entry, web_contents);
     EXPECT_FALSE(ContainsShortcut(shortcut, web_contents))
         << "Please remove the deprecated accelerator '" + shortcut +
                "' from the 'shortcut' section"
                " at the bottom of the file of "
                "'/chrome/browser/resources/chromeos/"
                "keyboard_overlay_data.js'.";
   }
 }