| Index: ash/system/web_notification/web_notification_tray.cc
|
| diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc
|
| index 0ca6e3c1c613469d48fc5f0631398d360cbcf7a1..b904c337a31171fac91ccac84c185ace0e07975d 100644
|
| --- a/ash/system/web_notification/web_notification_tray.cc
|
| +++ b/ash/system/web_notification/web_notification_tray.cc
|
| @@ -350,14 +350,24 @@ void WebNotificationTray::UpdateTrayAndBubble() {
|
| UpdateTray();
|
| }
|
|
|
| -void WebNotificationTray::HideBubble(WebNotificationBubble* bubble) {
|
| - if (bubble == message_center_bubble()) {
|
| +void WebNotificationTray::HideBubbleWithView(
|
| + const TrayBubbleView* bubble_view) {
|
| + if (message_center_bubble() &&
|
| + bubble_view == message_center_bubble()->bubble_view()) {
|
| HideMessageCenterBubble();
|
| - } else if (bubble == popup_bubble()) {
|
| + } else if (popup_bubble() && bubble_view == popup_bubble()->bubble_view()) {
|
| HidePopupBubble();
|
| }
|
| }
|
|
|
| +bool WebNotificationTray::ClickedOutsideBubble() {
|
| + // Only hide the message center.
|
| + if (!message_center_bubble())
|
| + return false;
|
| + HideMessageCenterBubble();
|
| + return true;
|
| +}
|
| +
|
| // Methods for testing
|
|
|
| size_t WebNotificationTray::GetNotificationCountForTest() const {
|
|
|