Index: chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_framework_service.cc |
diff --git a/chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_framework_service.cc b/chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_framework_service.cc |
index 3202d205a45082d56a1edd2cf6d86971cb1cf0b6..23de0b9148658073f2932af752914ca8d273730c 100644 |
--- a/chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_framework_service.cc |
+++ b/chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_framework_service.cc |
@@ -67,6 +67,9 @@ void ArcVoiceInteractionFrameworkService::OnInstanceReady() { |
ash::Shell::Get()->accelerator_controller()->Register( |
{ui::Accelerator(ui::VKEY_A, ui::EF_COMMAND_DOWN)}, this); |
+ ash::Shell::Get()->accelerator_controller()->Register( |
+ {ui::Accelerator(ui::VKEY_A, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN)}, |
+ this); |
} |
void ArcVoiceInteractionFrameworkService::OnInstanceClosed() { |
@@ -77,12 +80,23 @@ void ArcVoiceInteractionFrameworkService::OnInstanceClosed() { |
bool ArcVoiceInteractionFrameworkService::AcceleratorPressed( |
const ui::Accelerator& accelerator) { |
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
- mojom::VoiceInteractionFrameworkInstance* framework_instance = |
- ARC_GET_INSTANCE_FOR_METHOD( |
- arc_bridge_service()->voice_interaction_framework(), |
- StartVoiceInteractionSession); |
- DCHECK(framework_instance); |
- framework_instance->StartVoiceInteractionSession(); |
+ |
+ if (accelerator.modifiers() & ui::EF_SHIFT_DOWN) { |
Luis Héctor Chávez
2017/04/11 16:11:16
nit: accelerator.IsShiftDown()
Vladislav Kaznacheev
2017/04/11 18:59:33
Done.
|
+ mojom::VoiceInteractionFrameworkInstance* framework_instance = |
+ ARC_GET_INSTANCE_FOR_METHOD( |
+ arc_bridge_service()->voice_interaction_framework(), |
+ ToggleMetalayer); |
+ DCHECK(framework_instance); |
+ framework_instance->ToggleMetalayer(); |
+ } else { |
+ mojom::VoiceInteractionFrameworkInstance* framework_instance = |
+ ARC_GET_INSTANCE_FOR_METHOD( |
+ arc_bridge_service()->voice_interaction_framework(), |
+ StartVoiceInteractionSession); |
+ DCHECK(framework_instance); |
+ framework_instance->StartVoiceInteractionSession(); |
+ } |
+ |
return true; |
} |