mash: Fix system tray bubble not closing for clicks outside its bounds

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

 // Copyright 2014 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/public/cpp/window_tree_client.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 575 matching lines @@
                                              bool completed) {
   if (window_manager_internal_client_)
     window_manager_internal_client_->WmResponse(change_id, completed);
 
   if (change_id == current_wm_move_loop_change_) {
     current_wm_move_loop_change_ = 0;
     current_wm_move_loop_window_id_ = 0;
   }
 }
 
+void WindowTreeClient::SendToEventObserver(const ui::Event& event,
+                                           Window* target) {
+  // TODO(moshayedi): crbug.com/617222. No need to convert to ui::MouseEvent or
+  // ui::TouchEvent once we have proper support for pointer events.
+  if (event.IsMousePointerEvent())
+    delegate_->OnEventObserved(ui::MouseEvent(*event.AsPointerEvent()), target);
+  else if (event.IsTouchPointerEvent())
+    delegate_->OnEventObserved(ui::TouchEvent(*event.AsPointerEvent()), target);
+  else
+    delegate_->OnEventObserved(event, target);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeClient, WindowTreeClient implementation:
 
 void WindowTreeClient::SetDeleteOnNoRoots(bool value) {
   delete_on_no_roots_ = value;
 }
 
 const std::set<Window*>& WindowTreeClient::GetRoots() {
   return roots_;
 }
@@ skipping 367 matching lines @@
                                           Id window_id,
                                           std::unique_ptr<ui::Event> event,
                                           uint32_t event_observer_id) {
   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);
+    SendToEventObserver(*event, window);
 
   if (!window || !window->input_event_handler_) {
     tree_->OnWindowInputEventAck(event_id, mojom::EventResult::UNHANDLED);
     return;
   }
 
   std::unique_ptr<base::Callback<void(mojom::EventResult)>> ack_callback(
       new base::Callback<void(mojom::EventResult)>(
           base::Bind(&mojom::WindowTree::OnWindowInputEventAck,
                      base::Unretained(tree_), event_id)));
@@ skipping 14 matching lines @@
   // The handler did not take ownership of the callback, so we send the ack,
   // marking the event as not consumed.
   if (ack_callback)
     ack_callback->Run(mojom::EventResult::UNHANDLED);
 }
 
 void WindowTreeClient::OnEventObserved(std::unique_ptr<ui::Event> event,
                                        uint32_t event_observer_id) {
   DCHECK(event);
   if (has_event_observer_ && event_observer_id == event_observer_id_)
-    delegate_->OnEventObserved(*event.get(), nullptr /* target */);
+    SendToEventObserver(*event, nullptr /* target */);
 }
 
 void WindowTreeClient::OnWindowFocused(Id focused_window_id) {
   Window* focused_window = GetWindowByServerId(focused_window_id);
   InFlightFocusChange new_change(this, focused_window);
   if (ApplyServerChangeToExistingInFlightChange(new_change))
     return;
 
   LocalSetFocus(focused_window);
 }
@@ skipping 221 matching lines @@
     Window* window,
     const gfx::Vector2d& offset,
     const gfx::Insets& hit_area) {
   if (window_manager_internal_client_) {
     window_manager_internal_client_->SetUnderlaySurfaceOffsetAndExtendedHitArea(
         server_id(window), offset.x(), offset.y(), hit_area);
   }
 }
 
 }  // namespace ui