mus: Add watcher for all touch events.

services/ui/public/cpp/lib/window_tree_client.cc

Index: services/ui/public/cpp/lib/window_tree_client.cc
diff --git a/services/ui/public/cpp/lib/window_tree_client.cc b/services/ui/public/cpp/lib/window_tree_client.cc
index 570d3e10d63b5c0b8b3995c1b1dfd3e4a4e80204..278f09f2b7995fbdb4e23a07b8de9323d4c28c29 100644
--- a/services/ui/public/cpp/lib/window_tree_client.cc
+++ b/services/ui/public/cpp/lib/window_tree_client.cc
@@ -627,14 +627,23 @@ gfx::Point WindowTreeClient::GetCursorScreenPoint() {
                     static_cast<int16_t>(location & 0xFFFF));
 }
 
-void WindowTreeClient::SetEventObserver(mojom::EventMatcherPtr matcher) {
-  if (matcher.is_null()) {
-    has_event_observer_ = false;
-    tree_->SetEventObserver(nullptr, 0u);
-  } else {
-    has_event_observer_ = true;
+uint32_t WindowTreeClient::AddEventObserver(mojom::EventMatcherPtr matcher) {
+  if (!matcher.is_null()) {
     event_observer_id_++;
-    tree_->SetEventObserver(std::move(matcher), event_observer_id_);
+    tree_->AddEventObserver(std::move(matcher), event_observer_id_);
+    event_observer_ids_.push_back(event_observer_id_);
+    return event_observer_id_;
+  }
+  return 0u;
+}
+
+void WindowTreeClient::RemoveEventObserver(uint32_t event_observer_id) {
+  std::vector<uint32_t>::iterator it;
+  it = find(event_observer_ids_.begin(), event_observer_ids_.end(),
+    event_observer_id);
+  if (it != event_observer_ids_.end()) {
+    event_observer_ids_.erase(it);
+    tree_->RemoveEventObserver(event_observer_id);
   }
 }
 
@@ -964,18 +973,20 @@ void WindowTreeClient::OnWindowSharedPropertyChanged(
   WindowPrivate(window).LocalSetSharedProperty(name, std::move(new_data));
 }
 
-void WindowTreeClient::OnWindowInputEvent(uint32_t event_id,
-                                          Id window_id,
-                                          std::unique_ptr<ui::Event> event,
-                                          uint32_t event_observer_id) {
+void WindowTreeClient::OnWindowInputEvent(
+  uint32_t event_id, Id window_id, std::unique_ptr<ui::Event> event,
+  mojo::Array<uint32_t> event_observer_ids) {
   DCHECK(event);
   Window* window = GetWindowByServerId(window_id);  // May be null.
 
   // Non-zero event_observer_id means it matched an event observer on the
   // server.
-  if (event_observer_id != 0 && has_event_observer_ &&
-      event_observer_id == event_observer_id_)
-    delegate_->OnEventObserved(*event.get(), window);
+  for (uint32_t id : event_observer_ids) {
+    if (id != 0 && MatchEventObserverId(id)) {
+      delegate_->OnEventObserved(*event.get(), window);
+      break;
+    }
+  }
 
   if (!window || !window->input_event_handler_) {
     tree_->OnWindowInputEventAck(event_id, mojom::EventResult::UNHANDLED);
@@ -1006,11 +1017,15 @@ void WindowTreeClient::OnWindowInputEvent(uint32_t event_id,
     ack_callback->Run(mojom::EventResult::UNHANDLED);
 }
 
-void WindowTreeClient::OnEventObserved(std::unique_ptr<ui::Event> event,
-                                       uint32_t event_observer_id) {
+void WindowTreeClient::OnEventObserved(
+  std::unique_ptr<ui::Event> event, mojo::Array<uint32_t> event_observer_ids) {
   DCHECK(event);
-  if (has_event_observer_ && event_observer_id == event_observer_id_)
-    delegate_->OnEventObserved(*event.get(), nullptr /* target */);
+  for (uint32_t id : event_observer_ids) {
+    if (MatchEventObserverId(id)) {
+      delegate_->OnEventObserved(*event.get(), nullptr /* target */);
+      break;
+    }
+  }
 }
 
 void WindowTreeClient::OnWindowFocused(Id focused_window_id) {
@@ -1248,4 +1263,14 @@ void WindowTreeClient::SetUnderlaySurfaceOffsetAndExtendedHitArea(
   }
 }
 
+bool WindowTreeClient::MatchEventObserverId(uint32_t event_observer_id) {
+  std::vector<uint32_t>::iterator it;
+  it = find(event_observer_ids_.begin(), event_observer_ids_.end(),
+    event_observer_id);
+  if (it != event_observer_ids_.end()) {
+    return true;
+  }
+  return false;
+}
+
 }  // namespace ui