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

ash/pointer_watcher_delegate_aura.cc

Index: ash/pointer_watcher_delegate_aura.cc
diff --git a/ash/pointer_watcher_delegate_aura.cc b/ash/pointer_watcher_delegate_aura.cc
index 413ea71bb58bd019f77ac92646754bfb1207b0a6..3835ed51a3368635d45735f205a4c4a066a2da59 100644
--- a/ash/pointer_watcher_delegate_aura.cc
+++ b/ash/pointer_watcher_delegate_aura.cc
@@ -11,6 +11,7 @@
 #include "ui/events/event_constants.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/views/pointer_watcher.h"
+#include "ui/views/widget/widget.h"
 
 namespace ash {
 
@@ -34,14 +35,16 @@ void PointerWatcherDelegateAura::RemovePointerWatcher(
 
 void PointerWatcherDelegateAura::OnMouseEvent(ui::MouseEvent* event) {
   if (event->type() == ui::ET_MOUSE_PRESSED)
-    FOR_EACH_OBSERVER(views::PointerWatcher, pointer_watchers_,
-                      OnMousePressed(*event, GetLocationInScreen(*event)));
+    FOR_EACH_OBSERVER(
+        views::PointerWatcher, pointer_watchers_,
+        OnMousePressed(GetLocationInScreen(*event), GetTargetWidget(*event)));
 }
 
 void PointerWatcherDelegateAura::OnTouchEvent(ui::TouchEvent* event) {
   if (event->type() == ui::ET_TOUCH_PRESSED)
-    FOR_EACH_OBSERVER(views::PointerWatcher, pointer_watchers_,
-                      OnTouchPressed(*event, GetLocationInScreen(*event)));
+    FOR_EACH_OBSERVER(
+        views::PointerWatcher, pointer_watchers_,
+        OnTouchPressed(GetLocationInScreen(*event), GetTargetWidget(*event)));
 }
 
 gfx::Point PointerWatcherDelegateAura::GetLocationInScreen(
@@ -53,4 +56,10 @@ gfx::Point PointerWatcherDelegateAura::GetLocationInScreen(
   return location_in_screen;
 }
 
+views::Widget* PointerWatcherDelegateAura::GetTargetWidget(
+    const ui::LocatedEvent& event) const {
+  aura::Window* window = static_cast<aura::Window*>(event.target());
+  return views::Widget::GetTopLevelWidgetForNativeView(window);
+}
+
 }  // namespace ash