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); |