Adds ability for pre-target accelerators to not consume events

services/ui/public/cpp/tests/window_server_test_base.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 "services/ui/public/cpp/tests/window_server_test_base.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 113 matching lines @@
   if (window_manager_delegate_)
     window_manager_delegate_->OnWmClientJankinessChanged(client_windows, janky);
 }
 
 void WindowServerTestBase::OnWmNewDisplay(Window* window,
                                           const display::Display& display) {
   if (window_manager_delegate_)
     window_manager_delegate_->OnWmNewDisplay(window, display);
 }
 
-void WindowServerTestBase::OnAccelerator(uint32_t id, const ui::Event& event) {
-  if (window_manager_delegate_)
-    window_manager_delegate_->OnAccelerator(id, event);
-}
-
 void WindowServerTestBase::OnWmPerformMoveLoop(
     Window* window,
     mojom::MoveLoopSource source,
     const gfx::Point& cursor_location,
     const base::Callback<void(bool)>& on_done) {
   if (window_manager_delegate_) {
     window_manager_delegate_->OnWmPerformMoveLoop(window, source,
                                                   cursor_location, on_done);
   }
 }
 
 void WindowServerTestBase::OnWmCancelMoveLoop(Window* window) {
   if (window_manager_delegate_)
     window_manager_delegate_->OnWmCancelMoveLoop(window);
 }
 
+mojom::EventResult WindowServerTestBase::OnAccelerator(uint32_t accelerator_id,
+                                                       const ui::Event& event) {
+  return window_manager_delegate_
+             ? window_manager_delegate_->OnAccelerator(accelerator_id, event)
+             : mojom::EventResult::UNHANDLED;
+}
+
 void WindowServerTestBase::Create(shell::Connection* connection,
                                   mojom::WindowTreeClientRequest request) {
   new WindowTreeClient(this, nullptr, std::move(request));
 }
 
 }  // namespace ui