Adds ability for pre-target accelerators to not consume events

services/ui/public/cpp/tests/window_server_test_base.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 SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_
 #define SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 64 matching lines @@
   bool OnWmSetBounds(Window* window, gfx::Rect* bounds) override;
   bool OnWmSetProperty(
       Window* window,
       const std::string& name,
       std::unique_ptr<std::vector<uint8_t>>* new_data) override;
   Window* OnWmCreateTopLevelWindow(
       std::map<std::string, std::vector<uint8_t>>* properties) override;
   void OnWmClientJankinessChanged(const std::set<Window*>& client_windows,
                                   bool not_responding) override;
   void OnWmNewDisplay(Window* window, const display::Display& display) override;
-  void OnAccelerator(uint32_t id, const ui::Event& event) override;
   void OnWmPerformMoveLoop(Window* window,
                            mojom::MoveLoopSource source,
                            const gfx::Point& cursor_location,
                            const base::Callback<void(bool)>& on_done) override;
   void OnWmCancelMoveLoop(Window* window) override;
+  mojom::EventResult OnAccelerator(uint32_t accelerator_id,
+                                   const ui::Event& event) override;
 
   // InterfaceFactory<WindowTreeClient>:
   void Create(shell::Connection* connection,
               mojo::InterfaceRequest<mojom::WindowTreeClient> request) override;
 
   // Used to receive the most recent window tree client loaded by an embed
   // action.
   WindowTreeClient* most_recent_client_;
 
  private:
@@ skipping 10 matching lines @@
   WindowManagerClient* window_manager_client_;
 
   bool window_tree_client_destroyed_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_