Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2152)

Unified Diff: ash/system/tray/tray_event_filter.cc

Issue 661423004: Allow tray_event_filter to handle popup notifications. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: make the comment more clearly Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_event_filter.cc
diff --git a/ash/system/tray/tray_event_filter.cc b/ash/system/tray/tray_event_filter.cc
index 5ed01225e4eba1cf62e882e81911547b89388c0b..b7a6d617ba471134484a54fea154a5b65018bda2 100644
--- a/ash/system/tray/tray_event_filter.cc
+++ b/ash/system/tray/tray_event_filter.cc
@@ -62,6 +62,13 @@ bool TrayEventFilter::ProcessLocatedEvent(ui::LocatedEvent* event) {
->Contains(target)) {
return false;
}
+ // Don't process events that occurred inside the status area widget and
+ // a popup notification from message center.
+ if (root_controller &&
+ root_controller->GetContainer(kShellWindowId_StatusContainer)
+ ->Contains(target)) {
+ return false;
+ }
}
// Check the boundary for all wrappers, and do not handle the event if it
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698