mash: Fix shelf overflow bubble not closing on click outside its bounds

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 eff9a443ed96cd9e1d25b4b7fd10b0308a947151..f52771ad4d01ac89d58e7b4cfd6f50dcf773cec5 100644
--- a/ui/views/mus/window_manager_connection.cc
+++ b/ui/views/mus/window_manager_connection.cc
@@ -143,12 +143,20 @@ void WindowManagerConnection::OnConnectionLost(
     mus::WindowTreeConnection* connection) {}
 
 void WindowManagerConnection::OnEventObserved(const ui::Event& event) {
+  if (!event.IsLocatedEvent())
+    return;
+  // The mojo input events type converter uses the event root_location field
+  // to store screen coordinates. Screen coordinates really should be returned
+  // separately. See http://crbug.com/608547
+  gfx::Point location_in_screen = event.AsLocatedEvent()->root_location();
   if (event.type() == ui::ET_MOUSE_PRESSED) {
-    FOR_EACH_OBSERVER(PointerWatcher, pointer_watchers_,
-                      OnMousePressed(*event.AsMouseEvent()));
+    FOR_EACH_OBSERVER(
+        PointerWatcher, pointer_watchers_,
+        OnMousePressed(*event.AsMouseEvent(), location_in_screen));
   } else if (event.type() == ui::ET_TOUCH_PRESSED) {
-    FOR_EACH_OBSERVER(PointerWatcher, pointer_watchers_,
-                      OnTouchPressed(*event.AsTouchEvent()));
+    FOR_EACH_OBSERVER(
+        PointerWatcher, pointer_watchers_,
+        OnTouchPressed(*event.AsTouchEvent(), location_in_screen));
   }
 }