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

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

Issue 1949823002: WIP: Eliminate event.target() usage from TrayEventFilter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: container delegate Created 4 years, 7 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 | « ash/system/status_area_widget.cc ('k') | ash/system/tray/tray_bubble_wrapper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index 5e65db2e9e1ba76a5f68b44801016b6394911c68..5460050332934a20c6bad174b29b671b2395513e 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -703,15 +703,19 @@ TrayCast* SystemTray::GetTrayCastForTesting() const { return tray_cast_; }
TrayDate* SystemTray::GetTrayDateForTesting() const { return tray_date_; }
bool SystemTray::PerformAction(const ui::Event& event) {
+ //JAMES - this isn't called on mash when you click on the system tray bubble
+ LOG(ERROR) << "JAMES PerformAction";
// If we're already showing the default view, hide it; otherwise, show it
// (and hide any popup that's currently shown).
if (HasSystemBubbleType(SystemTrayBubble::BUBBLE_TYPE_DEFAULT)) {
+ LOG(ERROR) << "JAMES close";
system_bubble_->bubble()->Close();
} else {
int arrow_offset = TrayBubbleView::InitParams::kArrowDefaultOffset;
if (event.IsMouseEvent() || event.type() == ui::ET_GESTURE_TAP) {
const ui::LocatedEvent& located_event =
static_cast<const ui::LocatedEvent&>(event);
+ LOG(ERROR) << "JAMES location " << located_event.location().ToString();
if (wm::IsHorizontalAlignment(shelf_alignment())) {
gfx::Point point(located_event.x(), 0);
ConvertPointToWidget(this, &point);
« no previous file with comments | « ash/system/status_area_widget.cc ('k') | ash/system/tray/tray_bubble_wrapper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698