Adds kWillProcessAccelerator_KeyEventProperty

ash/mus/accelerators/accelerator_controller_registrar.cc

Index: ash/mus/accelerators/accelerator_controller_registrar.cc
diff --git a/ash/mus/accelerators/accelerator_controller_registrar.cc b/ash/mus/accelerators/accelerator_controller_registrar.cc
index 17daec5bac2376c6cf7ac0947f722701c862dfeb..e783e463fb2bbb6747c1978ff72857e1a8d3712d 100644
--- a/ash/mus/accelerators/accelerator_controller_registrar.cc
+++ b/ash/mus/accelerators/accelerator_controller_registrar.cc
@@ -11,9 +11,11 @@
 #include "ash/common/wm_shell.h"
 #include "ash/mus/accelerators/accelerator_ids.h"
 #include "ash/mus/window_manager.h"
+#include "ash/public/interfaces/event_properties.mojom.h"
 #include "ash/shell.h"
 #include "base/logging.h"
 #include "services/ui/common/accelerator_util.h"
+#include "services/ui/public/cpp/property_type_converters.h"
 #include "ui/base/accelerators/accelerator_history.h"
 
 namespace ash {
@@ -84,10 +86,17 @@ ui::mojom::EventResult AcceleratorControllerRegistrar::OnAccelerator(
     if (!target_window)
       target_window = Shell::GetWmRootWindowForNewWindows();
     DCHECK(target_window);
-    return router_->ProcessAccelerator(target_window, *(event.AsKeyEvent()),
-                                       accelerator)
-               ? ui::mojom::EventResult::HANDLED
-               : ui::mojom::EventResult::UNHANDLED;
+    if (router_->ProcessAccelerator(target_window, *(event.AsKeyEvent()),
+                                    accelerator)) {
+      return ui::mojom::EventResult::HANDLED;
+    }
+    if (accelerator_controller->IsActionForAcceleratorEnabled(accelerator)) {
+      // We do have an accelerator for the key. Set a property so that the real
+      // target knows we have an accelerator.
+      (*properties)[mojom::kWillProcessAccelerator_KeyEventProperty] =

[sky, 2017/03/24 18:02:23]

The |properties| supplied here are passed back to mus, which adds them to the
key event that chrome gets.

[sadrul, 2017/03/24 18:05:01]

Ooh, right. This is only for pre-target accelerators, right? (and I guess in
mash, all accelerators are both pre/post target?)

[sky, 2017/03/24 18:11:54]

Exactly. See line 75.
Yep.

+          std::vector<uint8_t>();
+    }
+    return ui::mojom::EventResult::UNHANDLED;
   }
   DCHECK_EQ(GetAcceleratorLocalId(id), ids.post_id);
   // NOTE: for post return value doesn't really matter.