mus: Notify the client whether adding an accelerator was successful.

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 "components/mus/public/cpp/event_matcher.h"
 #include "components/mus/ws/event_dispatcher_delegate.h"
 #include "components/mus/ws/server_window.h"
 #include "components/mus/ws/server_window_surface_manager_test_api.h"
@@ skipping 148 matching lines @@
   scoped_ptr<ui::Event> dispatched_event(
       dispatched_event_mojo.To<scoped_ptr<ui::Event>>());
   ASSERT_TRUE(dispatched_event.get());
   ASSERT_TRUE(dispatched_event->IsMouseEvent());
   ui::MouseEvent* dispatched_mouse_event =
       static_cast<ui::MouseEvent*>(dispatched_event.get());
   EXPECT_EQ(gfx::Point(20, 25), dispatched_mouse_event->root_location());
   EXPECT_EQ(gfx::Point(10, 15), dispatched_mouse_event->location());
 }
 
+TEST(EventDispatcherTest, AcceleratorBasic) {
+  TestEventDispatcherDelegate event_dispatcher_delegate(nullptr);
+  EventDispatcher dispatcher(&event_dispatcher_delegate);
+  uint32_t accelerator_1 = 1;
+  mojom::EventMatcherPtr matcher = mus::CreateKeyMatcher(
+      mus::mojom::KEYBOARD_CODE_W, mus::mojom::EVENT_FLAGS_CONTROL_DOWN);
+  EXPECT_TRUE(dispatcher.AddAccelerator(accelerator_1, matcher.Pass()));
+
+  uint32_t accelerator_2 = 2;
+  matcher = mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_N,
+                                  mus::mojom::EVENT_FLAGS_NONE);
+  EXPECT_TRUE(dispatcher.AddAccelerator(accelerator_2, matcher.Pass()));
+
+  // Attempting to add a new accelerator with the same id should fail.
+  matcher = mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_T,
+                                  mus::mojom::EVENT_FLAGS_NONE);
+  EXPECT_FALSE(dispatcher.AddAccelerator(accelerator_2, matcher.Pass()));
+
+  // Adding the accelerator with the same id should succeed once the existing
+  // accelerator is removed.
+  dispatcher.RemoveAccelerator(accelerator_2);
+  matcher = mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_T,
+                                  mus::mojom::EVENT_FLAGS_NONE);
+  EXPECT_TRUE(dispatcher.AddAccelerator(accelerator_2, matcher.Pass()));
+
+  // Attempting to add an accelerator with the same matcher should fail.
+  uint32_t accelerator_3 = 3;
+  matcher = mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_T,
+                                  mus::mojom::EVENT_FLAGS_NONE);
+  EXPECT_FALSE(dispatcher.AddAccelerator(accelerator_3, matcher.Pass()));
+
+  matcher = mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_T,
+                                  mus::mojom::EVENT_FLAGS_CONTROL_DOWN);
+  EXPECT_TRUE(dispatcher.AddAccelerator(accelerator_3, matcher.Pass()));
+}
+
 TEST(EventDispatcherTest, EventMatching) {
   TestServerWindowDelegate window_delegate;
   ServerWindow root(&window_delegate, WindowId(1, 2));
   TestEventDispatcherDelegate event_dispatcher_delegate(&root);
   EventDispatcher dispatcher(&event_dispatcher_delegate);
   dispatcher.set_root(&root);
 
   mojom::EventMatcherPtr matcher = mus::CreateKeyMatcher(
       mus::mojom::KEYBOARD_CODE_W, mus::mojom::EVENT_FLAGS_CONTROL_DOWN);
   uint32_t accelerator_1 = 1;
@@ skipping 384 matching lines @@
       dispatched_event_mojo.To<scoped_ptr<ui::Event>>());
   ASSERT_TRUE(dispatched_event.get());
   ASSERT_TRUE(dispatched_event->IsMouseEvent());
   ui::MouseEvent* dispatched_mouse_event =
       static_cast<ui::MouseEvent*>(dispatched_event.get());
   EXPECT_EQ(gfx::Point(-2, -1), dispatched_mouse_event->location());
 }
 
 }  // namespace ws
 }  // namespace mus