Adds kWillProcessAccelerator_KeyEventProperty

ash/mus/accelerators/accelerator_controller_registrar.cc

 // Copyright 2016 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 "ash/mus/accelerators/accelerator_controller_registrar.h"
 
 #include <limits>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accelerators/accelerator_router.h"
 #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 {
 namespace mus {
 namespace {
 
 // Callback from registering the accelerators.
 void OnAcceleratorsAdded(const std::vector<ui::Accelerator>& accelerators,
                          bool added) {
   // All our accelerators should be registered, so we expect |added| to be true.
@@ skipping 50 matching lines @@
     // same as it was in ash. We need to figure out exactly what is needed of
     // previous accelerator so that we can either register for the right set of
     // accelerators, or make WS send the previous accelerator.
     // http://crbug.com/630683.
     accelerator_controller->accelerator_history()->StoreCurrentAccelerator(
         accelerator);
     WmWindow* target_window = WmShell::Get()->GetFocusedWindow();
     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.
   return Shell::Get()->accelerator_controller()->Process(accelerator)
              ? ui::mojom::EventResult::HANDLED
              : ui::mojom::EventResult::UNHANDLED;
 }
 
 void AcceleratorControllerRegistrar::OnAcceleratorsRegistered(
     const std::vector<ui::Accelerator>& accelerators) {
@@ skipping 70 matching lines @@
   // Common case is we never wrap once, so this is typically cheap. Additionally
   // we expect there not to be too many accelerators.
   while (ids_.count(next_id_) > 0)
     ++next_id_;
   ids_.insert(next_id_);
   return next_id_++;
 }
 
 }  // namespace mus
 }  // namespace ash