Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1331)

Unified Diff: chrome/browser/ui/webui/chromeos/keyboard_overlay_ui_browsertest.cc

Issue 2898273002: Move Voice Interaction shortcut to accelerator_controller.cc (Closed)
Patch Set: Move Voice Interaction shortcut to accelerator_controller.cc Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/ash/app_list/app_list_presenter_service.cc ('k') | components/arc/arc_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/keyboard_overlay_ui_browsertest.cc
diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui_browsertest.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui_browsertest.cc
index 9e1161f0714f91b75da926637680bc8557ac9592..bbf48ed272a85207f075fe641280fd2c39b48351 100644
--- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui_browsertest.cc
@@ -59,12 +59,15 @@ bool IsDisplayUIScalingEnabled(content::WebContents* web_contents) {
// 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,
« no previous file with comments | « chrome/browser/ui/ash/app_list/app_list_presenter_service.cc ('k') | components/arc/arc_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698