Add AcceleratorType to EventMatcher

components/mus/ws/event_dispatcher_unittest.cc

 // 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.
 
 #include "components/mus/ws/event_dispatcher.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <queue>
@@ skipping 337 matching lines @@
   dispatcher->AddAccelerator(accelerator_2, std::move(matcher));
   dispatcher->ProcessEvent(key);
   EXPECT_EQ(accelerator_2,
             event_dispatcher_delegate->GetAndClearLastAccelerator());
 
   dispatcher->RemoveAccelerator(accelerator_2);
   dispatcher->ProcessEvent(key);
   EXPECT_EQ(0u, event_dispatcher_delegate->GetAndClearLastAccelerator());
 }
 
+// Tests that a post-target accelerator is not triggered by ProcessEvent.
+TEST_F(EventDispatcherTest, PostTargetAccelerator) {
+  TestEventDispatcherDelegate* event_dispatcher_delegate =
+      test_event_dispatcher_delegate();
+  EventDispatcher* dispatcher = event_dispatcher();
+
+  mojom::EventMatcherPtr matcher = mus::CreateKeyMatcher(
+      mus::mojom::KeyboardCode::W, mus::mojom::kEventFlagControlDown);
+  matcher->accelerator_matcher->accelerator_phase =
+      mojom::AcceleratorPhase::POST_TARGET;
+  uint32_t accelerator_1 = 1;
+  dispatcher->AddAccelerator(accelerator_1, std::move(matcher));
+
+  ui::KeyEvent key(ui::ET_KEY_PRESSED, ui::VKEY_W, ui::EF_CONTROL_DOWN);
+  dispatcher->ProcessEvent(key);
+  EXPECT_EQ(0u, event_dispatcher_delegate->GetAndClearLastAccelerator());
+
+  // TODO(jonross): Update this test to include actual invokation of PostTarget
+  // acceleratos once events acking includes consuming.
+}
+
 TEST_F(EventDispatcherTest, Capture) {
   ServerWindow* root = root_window();
   scoped_ptr<ServerWindow> child(CreateChildWindow(WindowId(1, 3)));
 
   root->SetBounds(gfx::Rect(0, 0, 100, 100));
   child->SetBounds(gfx::Rect(10, 10, 20, 20));
 
   MouseEventTest tests[] = {
       // Send a mouse down event over child.
       {ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::Point(20, 25),
@@ skipping 695 matching lines @@
 
     ui::PointerEvent* dispatched_event = details->event->AsPointerEvent();
     EXPECT_EQ(gfx::Point(25, 20), dispatched_event->root_location());
     EXPECT_EQ(gfx::Point(15, 10), dispatched_event->location());
     EXPECT_EQ(touch_id, dispatched_event->pointer_id());
   }
 }
 
 }  // namespace ws
 }  // namespace mus