Chromium Code Reviews| Index: ash/common/system/tray/system_tray.cc |
| diff --git a/ash/common/system/tray/system_tray.cc b/ash/common/system/tray/system_tray.cc |
| index b471a79cd70638c73d35de43c0c5c0d0eba675d1..5fcc2cf14d5a75503e8c8c919bcfeb355778c03c 100644 |
| --- a/ash/common/system/tray/system_tray.cc |
| +++ b/ash/common/system/tray/system_tray.cc |
| @@ -707,9 +707,10 @@ void SystemTray::ActivateBubble() { |
| } |
| bool SystemTray::PerformAction(const ui::Event& event) { |
| - // 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)) { |
| + // If we're already showing the menu (whatever default view or detailed view, |
|
tdanderson
2017/03/30 19:54:57
nit: no need to mention the bug number in the comm
|
| + // crbug.com/690112), hide it; otherwise, show it (and hide any popup that's |
| + // currently shown). |
| + if (system_bubble_.get()) { |
|
tdanderson
2017/03/30 19:54:57
nit: call HasSystemBubble() here instead
|
| system_bubble_->bubble()->Close(); |
| } else { |
| ShowDefaultView(BUBBLE_CREATE_NEW); |