Adds ability for accelerators to add key/value pairs to KeyEvent

ui/aura/mus/window_manager_delegate.h

 // Copyright 2015 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.
 
 #ifndef UI_AURA_MUS_WINDOW_MANAGER_DELEGATE_H_
 #define UI_AURA_MUS_WINDOW_MANAGER_DELEGATE_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "services/ui/public/interfaces/cursor.mojom.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
 #include "services/ui/public/interfaces/window_tree_constants.mojom.h"
 #include "ui/aura/aura_export.h"
 #include "ui/events/mojo/event.mojom.h"
 
@@ skipping 102 matching lines @@
       std::unique_ptr<WindowTreeHostMus> window_tree_host,
       const display::Display& display) = 0;
 
   // Called when a display is removed. |window_tree_host| is the WindowTreeHost
   // for the display.
   virtual void OnWmDisplayRemoved(WindowTreeHostMus* window_tree_host) = 0;
 
   // Called when a display is modified.
   virtual void OnWmDisplayModified(const display::Display& display) = 0;
 
-  virtual ui::mojom::EventResult OnAccelerator(uint32_t id,
-                                               const ui::Event& event);
+  // Called when an accelerator is received. |id| is the id previously
+  // registered via AddAccelerators(). For pre-target accelerators the delegate
+  // may add key/value pairs to |properties| that are then added to the
+  // KeyEvent that is sent to the client with the focused window (only if this
+  // returns UNHANDLED). |properties| may be used to pass around state from the
+  // window manager to clients.
+  virtual ui::mojom::EventResult OnAccelerator(
+      uint32_t id,
+      const ui::Event& event,
+      std::unordered_map<std::string, std::vector<uint8_t>>* properties);
 
   virtual void OnWmPerformMoveLoop(
       Window* window,
       ui::mojom::MoveLoopSource source,
       const gfx::Point& cursor_location,
       const base::Callback<void(bool)>& on_done) = 0;
 
   virtual void OnWmCancelMoveLoop(Window* window) = 0;
 
   // Called when then client changes the client area of a window.
   virtual void OnWmSetClientArea(
       Window* window,
       const gfx::Insets& insets,
       const std::vector<gfx::Rect>& additional_client_areas) = 0;
 
   // Returns whether |window| is the current active window.
   virtual bool IsWindowActive(Window* window) = 0;
 
   // Called when a client requests that its activation be given to another
   // window.
   virtual void OnWmDeactivateWindow(Window* window) = 0;
 
  protected:
   virtual ~WindowManagerDelegate() {}
 };
 
 }  // namespace ui
 
 #endif  // UI_AURA_MUS_WINDOW_MANAGER_DELEGATE_H_