Add AcceleratorType to EventMatcher

components/mus/ws/event_dispatcher.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 COMPONENTS_MUS_WS_EVENT_DISPATCHER_H_
 #define COMPONENTS_MUS_WS_EVENT_DISPATCHER_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 119 matching lines @@
 
   // Stops sending pointer events to |window|. This does not remove the entry
   // for |window| from |pointer_targets_|, rather it nulls out the window. This
   // way we continue to eat events until the up/cancel is received.
   void CancelPointerEventsToTarget(ServerWindow* window);
 
   // Returns true if we're currently an observer for |window|. We are an
   // observer for a window if any pointer events are targeting it.
   bool IsObservingWindow(ServerWindow* window);
 
-  // Looks to see if there is an accelerator bound to the specified code/flags.
-  // If there is one, sets |accelerator_id| to the id of the accelerator invoked
-  // and returns true. If there is none, returns false so normal key event
-  // processing can continue.
-  bool FindAccelerator(const ui::KeyEvent& event, uint32_t* accelerator_id);
+  // Looks to see if there is an accelerator bound to the specified code/flags,
+  // and of the matching |phase|. If there is one, sets |accelerator_id| to the
+  // id of the accelerator invoked and returns true. If there is none, returns
+  // false so normal key event processing can continue.
+  bool FindAccelerator(const ui::KeyEvent& event,
+                       const mojom::AcceleratorPhase phase,
+                       uint32_t* accelerator_id);
 
   // ServerWindowObserver:
   void OnWillChangeWindowHierarchy(ServerWindow* window,
                                    ServerWindow* new_parent,
                                    ServerWindow* old_parent) override;
   void OnWindowVisibilityChanged(ServerWindow* window) override;
   void OnWindowDestroyed(ServerWindow* window) override;
 
   EventDispatcherDelegate* delegate_;
   ServerWindow* root_;
@@ skipping 19 matching lines @@
   // cancel or up.
   PointerIdToTargetMap pointer_targets_;
 
   DISALLOW_COPY_AND_ASSIGN(EventDispatcher);
 };
 
 }  // namespace ws
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_EVENT_DISPATCHER_H_