Reland: mus: Enable system modal windows

components/mus/ws/event_dispatcher.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 COMPONENTS_MUS_WS_EVENT_DISPATCHER_H_
 #define COMPONENTS_MUS_WS_EVENT_DISPATCHER_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 42 matching lines @@
   }
 
   // |capture_window_| will receive all input. See window_tree.mojom for
   // details.
   ServerWindow* capture_window() { return capture_window_; }
   const ServerWindow* capture_window() const { return capture_window_; }
   // Setting capture can fail if the window is blocked by a modal window
   // (indicated by returning |false|).
   bool SetCaptureWindow(ServerWindow* capture_window, bool in_nonclient_area);
 
+  ServerWindow* system_modal_window() { return system_modal_window_; }
+  const ServerWindow* system_modal_window() const {
+    return system_modal_window_;
+  }
+
+  // |window| cannot be nullptr. The only way to unset system modal window is by
+  // destroying it.
+  bool SetSystemModalWindow(ServerWindow* window);
+
   // Retrieves the ServerWindow of the last mouse move.
   ServerWindow* mouse_cursor_source_window() const {
     return mouse_cursor_source_window_;
   }
 
   // Possibly updates the cursor. If we aren't in an implicit capture, we take
   // the last known location of the mouse pointer, and look for the
   // ServerWindow* under it.
   void UpdateCursorProviderByLastKnownLocation();
 
@@ skipping 68 matching lines @@
 
   // If |target->window| is valid, then passes the event to the delegate.
   void DispatchToPointerTarget(const PointerTarget& target,
                                const ui::LocatedEvent& event);
 
   // Stops sending pointer events to |window|. This does not remove the entry
   // for |window| from |pointer_targets_|, rather it nulls out the window. This
   // way we continue to eat events until the up/cancel is received.
   void CancelPointerEventsToTarget(ServerWindow* window);
 
-  // Returns true if we're currently an observer for |window|. We are an
-  // observer for a window if any pointer events are targeting it.
-  bool IsObservingWindow(ServerWindow* window);
+  // Used to observe a window. Can be called multiple times on a window. To
+  // unobserve a window, UnobserveWindow() should be called the same number of
+  // times.
+  void ObserveWindow(ServerWindow* winodw);
+  void UnobserveWindow(ServerWindow* winodw);
 
   // Returns an Accelerator bound to the specified code/flags, and of the
   // matching |phase|. Otherwise returns null.
   Accelerator* FindAccelerator(const ui::KeyEvent& event,
                                const mojom::AcceleratorPhase phase);
 
   // ServerWindowObserver:
   void OnWillChangeWindowHierarchy(ServerWindow* window,
                                    ServerWindow* new_parent,
                                    ServerWindow* old_parent) override;
   void OnWindowVisibilityChanged(ServerWindow* window) override;
   void OnWindowDestroyed(ServerWindow* window) override;
 
   EventDispatcherDelegate* delegate_;
   ServerWindow* root_;
+
   ServerWindow* capture_window_;
+  bool capture_window_in_nonclient_area_;
 
-  bool capture_window_in_nonclient_area_;
+  ServerWindow* system_modal_window_;
+
   bool mouse_button_down_;
   ServerWindow* mouse_cursor_source_window_;
 
   // The on screen location of the mouse pointer. This can be outside the
   // bounds of |mouse_cursor_source_window_|, which can capture the cursor.
   gfx::Point mouse_pointer_last_location_;
 
   cc::SurfaceId surface_id_;
 
   using Entry = std::pair<uint32_t, scoped_ptr<Accelerator>>;
   std::map<uint32_t, scoped_ptr<Accelerator>> accelerators_;
 
   using PointerIdToTargetMap = std::map<int32_t, PointerTarget>;
   // |pointer_targets_| contains the active pointers. For a mouse based pointer
   // a PointerTarget is always active (and present in |pointer_targets_|). For
   // touch based pointers the pointer is active while down and removed on
   // cancel or up.
   PointerIdToTargetMap pointer_targets_;
 
+  // Keeps track of number of observe requests for observed windows.
+  std::map<const ServerWindow*, uint8_t> observed_windows_;
+
   DISALLOW_COPY_AND_ASSIGN(EventDispatcher);
 };
 
 }  // namespace ws
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_EVENT_DISPATCHER_H_