summaryrefslogtreecommitdiffstats
path: root/ui/message_center
diff options
context:
space:
mode:
authordewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-05 20:26:31 +0000
committerdewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-05 20:26:31 +0000
commit71e61fb9c8643fa04f2397e854bb6e747d9fc668 (patch)
tree9b5ae4a22e29b0517e0dcf73dc1014a10b8fe315 /ui/message_center
parent692b49a3ec255c1ffbd2a76bc819cab667b1d85f (diff)
downloadchromium_src-71e61fb9c8643fa04f2397e854bb6e747d9fc668.zip
chromium_src-71e61fb9c8643fa04f2397e854bb6e747d9fc668.tar.gz
chromium_src-71e61fb9c8643fa04f2397e854bb6e747d9fc668.tar.bz2
Fix ManyPopupNotifications test with --enable-rich-notifications.
The switch to MessagePopupCollection broke this test but wasn't caught on the try bots since --enable-rich-notifications isn't run there. R=stevenjb@chromium.org TBR=mukai@chromium.org BUG=NONE TEST=ash_unittests --enable-rich-notifications Review URL: https://chromiumcodereview.appspot.com/12391041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186241 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/message_center')
-rw-r--r--ui/message_center/views/message_popup_collection.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/ui/message_center/views/message_popup_collection.h b/ui/message_center/views/message_popup_collection.h
index 3bf6568..0f71a2f 100644
--- a/ui/message_center/views/message_popup_collection.h
+++ b/ui/message_center/views/message_popup_collection.h
@@ -8,6 +8,7 @@
#include <list>
#include <map>
+#include "base/gtest_prod_util.h"
#include "base/timer.h"
#include "ui/message_center/message_center_export.h"
#include "ui/message_center/notification_list.h"
@@ -18,6 +19,10 @@ namespace views {
class Widget;
}
+namespace ash {
+FORWARD_DECLARE_TEST(WebNotificationTrayTest, ManyPopupNotifications);
+}
+
namespace message_center {
class ToastContentsView;
@@ -42,6 +47,8 @@ class MESSAGE_CENTER_EXPORT MessagePopupCollection
void OnMouseExited();
private:
+ FRIEND_TEST_ALL_PREFIXES(ash::WebNotificationTrayTest,
+ ManyPopupNotifications);
typedef std::map<std::string, ToastContentsView*> ToastContainer;
void CloseAllWidgets();