Add MetalayerMode to the palette.

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 23 matching lines @@
     return;
   }
   std::vector<uint8_t> result(png_data->front(),
                               png_data->front() + png_data->size());
   callback.Run(result);
 }
 
 }  // namespace
 
 // static
+const char ArcVoiceInteractionFrameworkService::kArcServiceName[] =
+    "arc::ArcVoiceInteractionFrameworkService";
+
+// static
 bool ArcVoiceInteractionFrameworkService::IsVoiceInteractionEnabled() {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       chromeos::switches::kEnableVoiceInteraction);
 }
 
 ArcVoiceInteractionFrameworkService::ArcVoiceInteractionFrameworkService(
     ArcBridgeService* bridge_service)
-    : ArcService(bridge_service), binding_(this) {
+    : ArcService(bridge_service), binding_(this), instance_ready_(false) {
   arc_bridge_service()->voice_interaction_framework()->AddObserver(this);
 }
 
 ArcVoiceInteractionFrameworkService::~ArcVoiceInteractionFrameworkService() {
   arc_bridge_service()->voice_interaction_framework()->RemoveObserver(this);
 }
 
 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);
   // Temporary shortcut added to enable the metalayer experiment.
   ash::Shell::Get()->accelerator_controller()->Register(
       {ui::Accelerator(ui::VKEY_A, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN)},
       this);
+
+  instance_ready_ = true;
 }
 
 void ArcVoiceInteractionFrameworkService::OnInstanceClosed() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);

[Luis Héctor Chávez, 2017/04/19 15:48:28]

if (!metalayer_closed_callback_.is_null())
  base::ResetAndReturn(&metalayer_closed_callback_).Run();
instance_ready_ = false; // if you end up keeping it.

[Vladislav Kaznacheev, 2017/04/19 23:42:59]

Done.

   ash::Shell::Get()->accelerator_controller()->UnregisterAll(this);
 }
 
 bool ArcVoiceInteractionFrameworkService::AcceleratorPressed(
     const ui::Accelerator& accelerator) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   if (accelerator.IsShiftDown()) {
-    mojom::VoiceInteractionFrameworkInstance* framework_instance =
-        ARC_GET_INSTANCE_FOR_METHOD(
-            arc_bridge_service()->voice_interaction_framework(),
-            ToggleMetalayer);
-    DCHECK(framework_instance);
-    framework_instance->ToggleMetalayer();
+    // Temporary, used for debugging. Does not update the palette state.
+    ShowMetalayer(true);
   } 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;
@@ skipping 28 matching lines @@
   // the screenshot to it.
   aura::Window* window = ash::Shell::GetPrimaryRootWindow();
   DCHECK(window);
   ui::GrabWindowSnapshotAsyncPNG(window, gfx::Rect(window->bounds().size()),
                                  base::CreateTaskRunnerWithTraits(
                                      base::TaskTraits().MayBlock().WithPriority(
                                          base::TaskPriority::USER_BLOCKING)),
                                  base::Bind(&ScreenshotCallback, callback));
 }
 
+void ArcVoiceInteractionFrameworkService::OnMetalayerComplete() {
+  if (metalayer_complete_.is_null())
+    return;
+  metalayer_complete_.Run();

[Luis Héctor Chávez, 2017/04/19 15:48:28]

nit: base::ResetAndReturn(&metalayer_closed_callback_).Run();

[Vladislav Kaznacheev, 2017/04/19 23:42:59]

Done.

+  metalayer_complete_ = base::Closure();
+}
+
+bool ArcVoiceInteractionFrameworkService::IsReady() {
+  return instance_ready_;
+}
+
+void ArcVoiceInteractionFrameworkService::ShowMetalayer(
+    const base::Closure& done) {
+  if (!metalayer_complete_.is_null()) {
+    LOG(ERROR) << "Metalayer is already enabled";
+    return;
+  }
+  metalayer_complete_ = done;
+  ShowMetalayer(true);
+}
+
+void ArcVoiceInteractionFrameworkService::HideMetalayer() {
+  if (metalayer_complete_.is_null()) {
+    LOG(ERROR) << "Metalayer is already hidden";
+    return;
+  }
+  metalayer_complete_ = base::Closure();
+  ShowMetalayer(false);
+}
+
+void ArcVoiceInteractionFrameworkService::ShowMetalayer(bool visible) {
+  mojom::VoiceInteractionFrameworkInstance* framework_instance =
+      ARC_GET_INSTANCE_FOR_METHOD(
+          arc_bridge_service()->voice_interaction_framework(), ShowMetalayer);
+  DCHECK(framework_instance);

[Luis Héctor Chávez, 2017/04/19 15:48:28]

substitute this with

if (visible && !framework_instance)
  base::ResetAndReturn(&metalayer_closed_callback_).Run();
if (!framework_instance)
  return;

[Vladislav Kaznacheev, 2017/04/19 23:42:58]

Substituted with a slight change.

+  framework_instance->ShowMetalayer(visible);
+}
+
 }  // namespace arc