mash: Don't close system tray bubble for clicks in menus/notifications

ui/views/mus/window_manager_connection.cc

 // Copyright 2015 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 "ui/views/mus/window_manager_connection.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
@@ skipping 124 matching lines @@
   // during iteration over the list even when the last observer is removed.
   base::ObserverList<PointerWatcher>::Iterator iterator(&pointer_watchers_);
   return !!iterator.GetNext();
 }
 
 void WindowManagerConnection::OnEmbed(mus::Window* root) {}
 
 void WindowManagerConnection::OnConnectionLost(
     mus::WindowTreeConnection* connection) {}
 
-void WindowManagerConnection::OnEventObserved(const ui::Event& event) {
+void WindowManagerConnection::OnEventObserved(const ui::Event& event,
+                                              mus::Window* target) {
   if (!event.IsLocatedEvent())
     return;
+  Widget* target_widget = nullptr;
+  if (target) {
+    mus::Window* root = target->GetRoot();
+    target_widget = NativeWidgetMus::GetWidgetForWindow(root);
+  }
+
   // 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(), location_in_screen));
+    FOR_EACH_OBSERVER(PointerWatcher, pointer_watchers_,
+                      OnMousePressed(*event.AsMouseEvent(), location_in_screen,
+                                     target_widget));
   } else if (event.type() == ui::ET_TOUCH_PRESSED) {
-    FOR_EACH_OBSERVER(
-        PointerWatcher, pointer_watchers_,
-        OnTouchPressed(*event.AsTouchEvent(), location_in_screen));
+    FOR_EACH_OBSERVER(PointerWatcher, pointer_watchers_,
+                      OnTouchPressed(*event.AsTouchEvent(), location_in_screen,
+                                     target_widget));
   }
 }
 
 void WindowManagerConnection::OnWindowManagerFrameValuesChanged() {
   if (window_tree_connection_)
     NativeWidgetMus::NotifyFrameChanged(window_tree_connection_.get());
 }
 
 gfx::Point WindowManagerConnection::GetCursorScreenPoint() {
   return window_tree_connection_->GetCursorScreenPoint();
 }
 
 }  // namespace views