Support region selection for voice interaction session

chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_framework_service.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 "chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_framework_service.h"
 
 #include <utility>
 #include <vector>
 
 #include "ash/accelerators/accelerator_controller.h"
@@ skipping 49 matching lines @@
 void ArcVoiceInteractionFrameworkService::OnInstanceReady() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   mojom::VoiceInteractionFrameworkInstance* framework_instance =
       ARC_GET_INSTANCE_FOR_METHOD(
           arc_bridge_service()->voice_interaction_framework(), Init);
   DCHECK(framework_instance);
   framework_instance->Init(binding_.CreateInterfacePtrAndBind());
 
   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() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   ash::Shell::Get()->accelerator_controller()->UnregisterAll(this);
 }
 
 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;
 }
 
 bool ArcVoiceInteractionFrameworkService::CanHandleAccelerators() const {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   return true;
 }
 
 void ArcVoiceInteractionFrameworkService::CaptureFocusedWindow(
     const CaptureFocusedWindowCallback& callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   aura::Window* window =
       ash::Shell::Get()->activation_client()->GetActiveWindow();
 
   if (window == nullptr) {
     callback.Run(std::vector<uint8_t>{});
     return;
   }
   ui::GrabWindowSnapshotAsyncPNG(window, gfx::Rect(window->bounds().size()),
                                  base::CreateTaskRunnerWithTraits(
                                      base::TaskTraits().MayBlock().WithPriority(
                                          base::TaskPriority::USER_BLOCKING)),
                                  base::Bind(&ScreenshotCallback, callback));
 }
 
 }  // namespace arc