summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authordewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-06 03:57:49 +0000
committerdewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-06 03:57:49 +0000
commit89846d8c1ecb22a19a3822d2a13e76dde4a2feb9 (patch)
treed6b05f5f05121b4d05c278ba3a087f9a7c61fbc7 /ash
parentf8bf4cccb0d8f3723a98a01fbf0453c4448c7a54 (diff)
downloadchromium_src-89846d8c1ecb22a19a3822d2a13e76dde4a2feb9.zip
chromium_src-89846d8c1ecb22a19a3822d2a13e76dde4a2feb9.tar.gz
chromium_src-89846d8c1ecb22a19a3822d2a13e76dde4a2feb9.tar.bz2
[Mac][Win] Hide notifications popups when entering fullscreen mode.
They currently remain until expiration which could be forever in the case of webkit notifications. TODO: chromeos. R=mukai@chromium.org, stevenjb@chromium.org TBR=johnnyg@chromium.org BUG=233752 Review URL: https://chromiumcodereview.appspot.com/19027005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/system/web_notification/web_notification_tray.cc4
-rw-r--r--ash/system/web_notification/web_notification_tray.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc
index e59b241..2b33e44 100644
--- a/ash/system/web_notification/web_notification_tray.cc
+++ b/ash/system/web_notification/web_notification_tray.cc
@@ -538,6 +538,10 @@ bool WebNotificationTray::ShowNotifierSettings() {
return ShowMessageCenterInternal(true /* show_settings */);
}
+message_center::MessageCenterTray* WebNotificationTray::GetMessageCenterTray() {
+ return message_center_tray_.get();
+}
+
bool WebNotificationTray::IsPressed() {
return IsMessageCenterBubbleVisible();
}
diff --git a/ash/system/web_notification/web_notification_tray.h b/ash/system/web_notification/web_notification_tray.h
index 0044875..d8b2fd3 100644
--- a/ash/system/web_notification/web_notification_tray.h
+++ b/ash/system/web_notification/web_notification_tray.h
@@ -107,6 +107,7 @@ class ASH_EXPORT WebNotificationTray
virtual bool ShowPopups() OVERRIDE;
virtual void HidePopups() OVERRIDE;
virtual bool ShowNotifierSettings() OVERRIDE;
+ virtual message_center::MessageCenterTray* GetMessageCenterTray() OVERRIDE;
// Overridden from TrayBackgroundView.
virtual bool IsPressed() OVERRIDE;