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

Unified Diff: chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_framework_service.cc

Issue 2803403002: Support region selection for voice interaction session (Closed)
Patch Set: Removed 'auto' Created 3 years, 8 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
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;
}
« no previous file with comments | « no previous file | chrome/browser/ui/ash/palette_delegate_chromeos.h » ('j') | chrome/browser/ui/ash/palette_delegate_chromeos.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698