Adds ability for pre-target accelerators to not consume events

services/ui/ws/window_tree.h

 // Copyright 2014 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_WS_WINDOW_TREE_H_
 #define SERVICES_UI_WS_WINDOW_TREE_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 162 matching lines @@
   void DispatchInputEvent(ServerWindow* target, const ui::Event& event);
 
   bool IsWaitingForNewTopLevelWindow(uint32_t wm_change_id);
   void OnWindowManagerCreatedTopLevelWindow(uint32_t wm_change_id,
                                             uint32_t client_change_id,
                                             const ServerWindow* window);
   void AddActivationParent(const ClientWindowId& window_id);
 
   // Calls through to the client.
   void OnChangeCompleted(uint32_t change_id, bool success);
-  void OnAccelerator(uint32_t accelerator_id, const ui::Event& event);
+  // |state_to_ack| is the WindowManagerState to call through to when the ack
+  // from the accelerator is received. If |needs_ack| is true an ack is
+  // required.
+  void OnAccelerator(uint32_t accelerator_id,
+                     const ui::Event& event,
+                     bool needs_ack);
 
   // Called when |tree|'s jankiness changes (see janky_ for definition).
   // Notifies the window manager client so it can update UI for the affected
   // window(s).
   void ClientJankinessChanged(WindowTree* tree);
 
   // The following methods are invoked after the corresponding change has been
   // processed. They do the appropriate bookkeeping and update the client as
   // necessary.
   void ProcessWindowBoundsChanged(const ServerWindow* window,
@@ skipping 125 matching lines @@
   void NotifyDrawnStateChanged(const ServerWindow* window,
                                bool new_drawn_value);
 
   // Deletes all Windows we own.
   void DestroyWindows();
 
   bool CanEmbed(const ClientWindowId& window_id) const;
   void PrepareForEmbed(ServerWindow* window);
   void RemoveChildrenAsPartOfEmbed(ServerWindow* window);
 
+  // Generates a new event id for an accelerator or event ack, sets it in
+  // |event_ack_id_| and returns it.
+  uint32_t GenerateEventAckId();
+
   void DispatchInputEventImpl(ServerWindow* target, const ui::Event& event);
 
   // Calls OnChangeCompleted() on the client.
   void NotifyChangeCompleted(uint32_t change_id,
                              mojom::WindowManagerErrorCode error_code);
 
   // WindowTree:
   void NewWindow(uint32_t change_id,
                  Id transport_window_id,
                  mojo::Map<mojo::String, mojo::Array<uint8_t>>
@@ skipping 81 matching lines @@
       int32_t y_offset,
       const gfx::Insets& hit_area) override;
   void WmResponse(uint32_t change_id, bool response) override;
   void WmRequestClose(Id transport_window_id) override;
   void WmSetFrameDecorationValues(
       mojom::FrameDecorationValuesPtr values) override;
   void WmSetNonClientCursor(uint32_t window_id,
                             mojom::Cursor cursor_id) override;
   void OnWmCreatedTopLevelWindow(uint32_t change_id,
                                  Id transport_window_id) override;
+  void OnAcceleratorAck(uint32_t event_id, mojom::EventResult result) override;
 
   // AccessPolicyDelegate:
   bool HasRootForAccessPolicy(const ServerWindow* window) const override;
   bool IsWindowKnownForAccessPolicy(const ServerWindow* window) const override;
   bool IsWindowRootOfAnotherTreeForAccessPolicy(
       const ServerWindow* window) const override;
 
   WindowServer* window_server_;
 
   UserId user_id_;
@@ skipping 48 matching lines @@
       waiting_for_top_level_window_info_;
   bool embedder_intercepts_events_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTree);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_WINDOW_TREE_H_