mus: Change PointerWatcher to observe all pointer events, with moves optional.

services/ui/ws/window_manager_state.cc

 // 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.
 
 #include "services/ui/ws/window_manager_state.h"
 
 #include "base/memory/weak_ptr.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
 #include "services/ui/common/event_matcher_util.h"
 #include "services/ui/ws/accelerator.h"
@@ skipping 228 matching lines @@
   event_ack_timer_.Stop();
   event_dispatch_phase_ = EventDispatchPhase::NONE;
   std::unique_ptr<ui::Event> event = std::move(event_awaiting_input_ack_);
 
   if (result == mojom::EventResult::UNHANDLED) {
     event_dispatcher_.ProcessEvent(
         *event, EventDispatcher::AcceleratorMatchPhase::POST_ONLY);
   } else {
     // We're not going to process the event any further, notify event observers.
     // We don't do this first to ensure we don't send an event twice to clients.
-    window_server()->SendToEventObservers(*event, user_id(), nullptr);
+    window_server()->SendToPointerWatchers(*event, user_id(), nullptr);
     ProcessNextEventFromQueue();
   }
 }
 
 const WindowServer* WindowManagerState::window_server() const {
   return window_tree_->window_server();
 }
 
 WindowServer* WindowManagerState::window_server() {
   return window_tree_->window_server();
@@ skipping 91 matching lines @@
   WindowTree* tree = window_server()->GetTreeWithId(client_id);
 
   ScheduleInputEventTimeout(tree);
 
   if (accelerator) {
     event_awaiting_input_ack_ = ui::Event::Clone(event);
     post_target_accelerator_ = accelerator;
   }
 
   // Ignore |tree| because it will receive the event via normal dispatch.
-  window_server()->SendToEventObservers(event, user_id(), tree);
+  window_server()->SendToPointerWatchers(event, user_id(), tree);
 
   tree->DispatchInputEvent(target, event);
 }
 
 void WindowManagerState::AddDebugAccelerators() {
   // Always register the accelerators, even if they only work in debug, so that
   // keyboard behavior is the same in release and debug builds.
   mojom::EventMatcherPtr matcher = CreateKeyMatcher(
       ui::mojom::KeyboardCode::S, ui::mojom::kEventFlagControlDown |
                                       ui::mojom::kEventFlagAltDown |
@@ skipping 151 matching lines @@
 
   // TODO(sky): this isn't right. To correctly implement need bounds of
   // Display, which we aren't tracking yet. For now, use the first display.
   Display* display = *(display_manager()->displays().begin());
   WindowManagerDisplayRoot* display_root =
       display->GetWindowManagerDisplayRootForUser(user_id());
   return display_root ? display_root->root() : nullptr;
 }
 
 void WindowManagerState::OnEventTargetNotFound(const ui::Event& event) {
-  window_server()->SendToEventObservers(event, user_id(),
-                                        nullptr /* ignore_tree */);
+  window_server()->SendToPointerWatchers(event, user_id(),
+                                         nullptr /* ignore_tree */);
 }
 
 }  // namespace ws
 }  // namespace ui