mus: Change PointerWatcher to watch for all events.

ui/views/mus/window_manager_connection.cc

Index: ui/views/mus/window_manager_connection.cc
diff --git a/ui/views/mus/window_manager_connection.cc b/ui/views/mus/window_manager_connection.cc
index bbefa730920dc62382fe2ebe1c4016ecaa63683c..a9b9b2f231452d13f4fe3f6d57cf15334c561596 100644
--- a/ui/views/mus/window_manager_connection.cc
+++ b/ui/views/mus/window_manager_connection.cc
@@ -20,8 +20,8 @@
 #include "ui/views/mus/clipboard_mus.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/mus/screen_mus.h"
+#include "ui/views/pointer_event_watcher.h"
 #include "ui/views/pointer_watcher.h"
-#include "ui/views/touch_event_watcher.h"
 #include "ui/views/views_delegate.h"
 
 namespace views {
@@ -83,7 +83,7 @@ NativeWidget* WindowManagerConnection::CreateNativeWidgetMus(
 
 void WindowManagerConnection::AddPointerWatcher(PointerWatcher* watcher) {
   // TODO(riajiang): Support multiple event matchers (crbug.com/627146).
-  DCHECK(!HasTouchEventWatcher());
+  DCHECK(!HasTouchEventWatcher() && !HasMouseEventWatcher());
   bool had_watcher = HasPointerWatcher();
   pointer_watchers_.AddObserver(watcher);
   if (!had_watcher) {
@@ -104,9 +104,10 @@ void WindowManagerConnection::RemovePointerWatcher(PointerWatcher* watcher) {
   }
 }
 
-void WindowManagerConnection::AddTouchEventWatcher(TouchEventWatcher* watcher) {
+void WindowManagerConnection::AddTouchEventWatcher(
+    PointerEventWatcher* watcher) {
   // TODO(riajiang): Support multiple event matchers (crbug.com/627146).
-  DCHECK(!HasPointerWatcher());
+  DCHECK(!HasPointerWatcher() && !HasMouseEventWatcher());
   bool had_watcher = HasTouchEventWatcher();
   touch_event_watchers_.AddObserver(watcher);
   if (!had_watcher) {
@@ -118,7 +119,7 @@ void WindowManagerConnection::AddTouchEventWatcher(TouchEventWatcher* watcher) {
 }
 
 void WindowManagerConnection::RemoveTouchEventWatcher(
-    TouchEventWatcher* watcher) {
+    PointerEventWatcher* watcher) {
   touch_event_watchers_.RemoveObserver(watcher);
   if (!HasTouchEventWatcher()) {
     // Last TouchEventWatcher removed, stop the event observer.
@@ -126,6 +127,29 @@ void WindowManagerConnection::RemoveTouchEventWatcher(
   }
 }
 
+void WindowManagerConnection::AddMouseEventWatcher(
+    PointerEventWatcher* watcher) {
+  // TODO(riajiang): Support multiple event matchers (crbug.com/627146).
+  DCHECK(!HasPointerWatcher() && !HasTouchEventWatcher());
+  bool had_watcher = HasMouseEventWatcher();
+  mouse_event_watchers_.AddObserver(watcher);
+  if (!had_watcher) {
+    ui::mojom::EventMatcherPtr matcher = ui::mojom::EventMatcher::New();
+    matcher->pointer_kind_matcher = ui::mojom::PointerKindMatcher::New();
+    matcher->pointer_kind_matcher->pointer_kind = ui::mojom::PointerKind::MOUSE;
+    client_->SetEventObserver(std::move(matcher));
+  }
+}
+
+void WindowManagerConnection::RemoveMouseEventWatcher(
+    PointerEventWatcher* watcher) {
+  mouse_event_watchers_.RemoveObserver(watcher);
+  if (!HasMouseEventWatcher()) {
+    // Last MouseEventWatcher removed, stop the event observer.
+    client_->SetEventObserver(nullptr);
+  }
+}
+
 const std::set<ui::Window*>& WindowManagerConnection::GetRoots() const {
   return client_->GetRoots();
 }
@@ -180,11 +204,20 @@ bool WindowManagerConnection::HasTouchEventWatcher() {
   // Check to see if we really have any observers left. This doesn't use
   // base::ObserverList<>::might_have_observers() because that returns true
   // during iteration over the list even when the last observer is removed.
-  base::ObserverList<TouchEventWatcher>::Iterator iterator(
+  base::ObserverList<PointerEventWatcher>::Iterator iterator(
       &touch_event_watchers_);
   return !!iterator.GetNext();
 }
 
+bool WindowManagerConnection::HasMouseEventWatcher() {
+  // Check to see if we really have any observers left. This doesn't use
+  // base::ObserverList<>::might_have_observers() because that returns true
+  // during iteration over the list even when the last observer is removed.
+  base::ObserverList<PointerEventWatcher>::Iterator iterator(
+      &mouse_event_watchers_);
+  return !!iterator.GetNext();
+}
+
 void WindowManagerConnection::OnEmbed(ui::Window* root) {}
 
 void WindowManagerConnection::OnDidDestroyClient(ui::WindowTreeClient* client) {
@@ -222,9 +255,15 @@ void WindowManagerConnection::OnEventObserved(const ui::Event& event,
   } else if (HasTouchEventWatcher()) {
     if (event.IsTouchEvent() || event.IsTouchPointerEvent()) {
       FOR_EACH_OBSERVER(
-          TouchEventWatcher, touch_event_watchers_,
+          PointerEventWatcher, touch_event_watchers_,
           OnTouchEventObserved(*event.AsLocatedEvent(), target_widget));
     }
+  } else if (HasMouseEventWatcher()) {
+    if (event.IsMouseEvent() || event.IsMousePointerEvent()) {
+      FOR_EACH_OBSERVER(
+          PointerEventWatcher, mouse_event_watchers_,
+          OnMouseEventObserved(*event.AsLocatedEvent(), target_widget));
+    }
   }
 }