Adds ability for pre-target accelerators to not consume events

services/ui/public/interfaces/window_manager.mojom

 // 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.
 
 module ui.mojom;
 
 import "services/ui/public/interfaces/cursor.mojom";
 import "services/ui/public/interfaces/event_matcher.mojom";
 import "services/ui/public/interfaces/window_manager_constants.mojom";
 import "services/ui/public/interfaces/window_tree_constants.mojom";
@@ skipping 75 matching lines @@
   // Asks the WindowManager to interactively move the window. This will return
   // whether this completed successfully or not through the client's
   // OnWmMoveLoopCompleted().
   WmPerformMoveLoop(uint32 change_id, uint32 window_id,
                     MoveLoopSource source,
                     gfx.mojom.Point cursor_location);
 
   // Asks the WindowManager to cancel any outstanding move loop on |change_id|.
   WmCancelMoveLoop(uint32 change_id);
 
-  // An accelerator registered via AddAccelerator() has been triggered.
-  OnAccelerator(uint32 id, ui.mojom.Event event);
+  // An accelerator registered via AddAccelerator() has been triggered. If
+  // |ack_id| is non-zero the accelerator matches a PRE_TARGET and must be
+  // acknowledged by WindowManagerClient::OnAcceleratorAck().
+  OnAccelerator(uint32 ack_id, uint32 accelerator_id, ui.mojom.Event event);
 };
 
 // This interface is only used as an associated interface and is associated
 // with WindowTree.
 interface WindowManagerClient {
   // Enables (or disables) child windows of |window_id| to be activated.
   AddActivationParent(uint32 window_id);
   RemoveActivationParent(uint32 window_id);
 
   ActivateNextWindow();
 
   // Sets the underlay surface offset for the specified window and additional
   // hit area. The underlay surface is drawn at the bounds of the window minus
   // the offset. The hit area is extended from the bounds of the window by
   // |hit_area|.
   SetUnderlaySurfaceOffsetAndExtendedHitArea(uint32 window_id,
                                              int32 x_offset,
                                              int32 y_offset,
                                              gfx.mojom.Insets hit_area);
 
   // Add and remove accelerators. When accelerators are registered the
   // WindowManager receives the event via OnAccelerator() rather than the
   // target window. The id is defined by the client and can be used to more
   // easily identify the accelerator's action. If an accelerator with the same
   // id or the same matcher already exists, then the accelerator is not added.
   // Accelerator ids 1 << 31 and above are reserved for internal use.
+  //
+  // See WindowTree for details on event dispatch.
   AddAccelerator(uint32 id, EventMatcher matcher) => (bool success);
   RemoveAccelerator(uint32 id);
 
   // The window manager has completed a request with the specific change id.
   WmResponse(uint32 change_id, bool response);
 
   // Calls WindowTreeClient::RequestClose() on the embedded app at the
   // specified window.
   WmRequestClose(uint32 window_id);
 
   // Sets the frame decoration constants of the display the window manager is
   // associated with.
   WmSetFrameDecorationValues(FrameDecorationValues values);
 
   // Sets the cursor that the non-client areas of the window should use.
   WmSetNonClientCursor(uint32 window_id, Cursor cursor_id);
 
   // Response from WmCreateTopLevelWindow() informing the client of the id for
   // the new window.
   OnWmCreatedTopLevelWindow(uint32 change_id, uint32 window_id);
+
+  // See description in WindowManager::OnAccelerator(). |ack_id| is the value
+  // that was passed to OnAccelerator().
+  OnAcceleratorAck(uint32 ack_id, EventResult event_result);
 };