Changes accelerators registered by mus to not interfere with those of client

services/ui/ws/window_manager_state.h

 // Copyright 2016 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_MANAGER_STATE_H_
 #define SERVICES_UI_WS_WINDOW_MANAGER_STATE_H_
 
 #include <stdint.h>
 
 #include <memory>
+#include <vector>
 
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
 #include "services/ui/public/interfaces/display.mojom.h"
 #include "services/ui/ws/event_dispatcher.h"
 #include "services/ui/ws/event_dispatcher_delegate.h"
 #include "services/ui/ws/user_id.h"
 #include "services/ui/ws/window_server.h"
 
 namespace ui {
@@ skipping 59 matching lines @@
   void OnEventAck(mojom::WindowTree* tree, mojom::EventResult result);
 
   // Called when the WindowManager acks an accelerator.
   void OnAcceleratorAck(mojom::EventResult result);
 
  private:
   class ProcessedEventTarget;
   friend class Display;
   friend class test::WindowManagerStateTestApi;
 
+  enum class DebugAcceleratorType {
+    PRINT_WINDOWS,
+  };
+
+  struct DebugAccelerator {
+    DebugAcceleratorType type;
+    ui::KeyboardCode key_code;
+    int event_flags;
+  };
+
   enum class EventDispatchPhase {
     // Not actively dispatching.
     NONE,
 
     // A PRE_TARGET accelerator has been encountered and we're awaiting the ack.
     PRE_TARGET_ACCELERATOR,
 
     // Dispatching to the target, awaiting the ack.
     TARGET,
   };
@@ skipping 24 matching lines @@
   void SetAllRootWindowsVisible(bool value);
 
   // Returns the ServerWindow that is the root of the WindowManager for
   // |window|. |window| corresponds to the root of a Display.
   ServerWindow* GetWindowManagerRoot(ServerWindow* window);
 
   // Called if the client doesn't ack an event in the appropriate amount of
   // time.
   void OnEventAckTimeout(ClientSpecificId client_id);
 
+  // Implemenation of processing an event with a match phase of all. This
+  // handles debug accelerators and forwards to EventDispatcher.
+  void ProcessEventImpl(const ui::Event& event);
+
   // Schedules an event to be processed later.
   void QueueEvent(const ui::Event& event,
                   std::unique_ptr<ProcessedEventTarget> processed_event_target);
 
   // Processes the next valid event in |event_queue_|. If the event has already
   // been processed it is dispatched, otherwise the event is passed to the
   // EventDispatcher for processing.
   void ProcessNextEventFromQueue();
 
   // Dispatches the event to the appropriate client and starts the ack timer.
   void DispatchInputEventToWindowImpl(ServerWindow* target,
                                       ClientSpecificId client_id,
                                       const ui::Event& event,
                                       base::WeakPtr<Accelerator> accelerator);
 
   // Registers accelerators used internally for debugging.
   void AddDebugAccelerators();
 
-  // Returns true if the accelerator was handled.
-  bool HandleDebugAccelerator(uint32_t accelerator_id);
+  // Finds the debug accelerator for |event| and if one is found calls
+  // HandleDebugAccelerator().
+  void ProcessDebugAccelerator(const ui::Event& event);
+
+  // Runs the specified debug accelerator.
+  void HandleDebugAccelerator(DebugAcceleratorType type);
 
   // Called when waiting for an event or accelerator to be processed by |tree|.
   void ScheduleInputEventTimeout(WindowTree* tree);
 
   // EventDispatcherDelegate:
   void OnAccelerator(uint32_t accelerator_id,
                      const ui::Event& event,
                      AcceleratorPhase phase) override;
   void SetFocusedWindowFromEventDispatcher(ServerWindow* window) override;
   ServerWindow* GetFocusedWindowForEventDispatcher() override;
@@ skipping 20 matching lines @@
 
   EventDispatchPhase event_dispatch_phase_ = EventDispatchPhase::NONE;
   // The tree we're waiting to process the current accelerator or event.
   mojom::WindowTree* tree_awaiting_input_ack_ = nullptr;
   // The event we're awaiting an accelerator or input ack from.
   std::unique_ptr<ui::Event> event_awaiting_input_ack_;
   base::WeakPtr<Accelerator> post_target_accelerator_;
   std::queue<std::unique_ptr<QueuedEvent>> event_queue_;
   base::OneShotTimer event_ack_timer_;
 
+  std::vector<DebugAccelerator> debug_accelerators_;
+
   EventDispatcher event_dispatcher_;
 
   // PlatformDisplay that currently has capture.
   PlatformDisplay* platform_display_with_capture_ = nullptr;
 
   base::WeakPtrFactory<WindowManagerState> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerState);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_WINDOW_MANAGER_STATE_H_