Add AcceleratorType to EventMatcher

components/mus/public/interfaces/input_event_matcher.mojom

 // 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.
 
 module mus.mojom;
 
 import "components/mus/public/interfaces/input_event_constants.mojom";
 import "components/mus/public/interfaces/input_key_codes.mojom";
 import "ui/mojo/geometry/geometry.mojom";
 
+
+struct AcceleratorPhaseMatcher {
+  AcceleratorPhase accelerator_phase;
+};
+
 struct KeyEventMatcher {
   KeyboardCode keyboard_code;
 };
 
 struct PointerKindMatcher {
   PointerKind pointer_kind;
 };
 
 struct PointerLocationMatcher {
   mojo.RectF region;
@@ skipping 14 matching lines @@
 // types will match this EventMatcher. Similarly, if |key_matcher| is missing,
 // then all key-events will match.
 // An example matcher to match the Ctrl+A accelerator would be:
 // - |type_matcher.type| = mus::mojom::EventType::KEY_PRESSED
 // - |flags_matcher.flags| = mus::mojom::kEventVlagControlDown
 // - |key_matcher.keyboard_code| = mus::mojom::KeyboardCode::A
 //
 // A matcher to match any key-press event would be:
 // - |type_matcher.type| = mus::mojom::EventType::KEY_PRESSED
 struct EventMatcher {
+  AcceleratorPhaseMatcher accelerator_matcher;

[sky, 2016/03/04 16:51:55]

As the phase is always required can you do away with the struct and use the enum
directly here?

[jonross, 2016/03/04 20:38:20]

Certainly. Thought that will imply a default.

I would be fine with defaulting to pre-target phase. However we could add an
'undefined' phase as the default, and require apps to specify which one.

Thoughts?

[sky, 2016/03/04 21:36:16]

Ah, I see what you're saying. I'm fine with pretarget.

[jonross, 2016/03/04 22:13:03]

Awesome. Done.

   EventTypeMatcher? type_matcher;
   EventFlagsMatcher? flags_matcher;
   // These flags will be stripped from incoming events' flags when comparing
   // against |flags_matcher|.
   EventFlagsMatcher? ignore_flags_matcher;
   KeyEventMatcher? key_matcher;
   PointerKindMatcher? pointer_kind_matcher;
   PointerLocationMatcher? pointer_location_matcher;
 };