Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1160)

Unified Diff: ash/system/web_notification/web_notification_tray_unittest.cc

Issue 12326091: Made notification center notifications collapsed and expandable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase, rebase, and rebase again! Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/api/notifications/notifications_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/web_notification/web_notification_tray_unittest.cc
diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc
index b58845c587758a6ac515bbe5b8a86c10e7be9450..7895d189dc4b67e381818b2186c27a5505efd3fe 100644
--- a/ash/system/web_notification/web_notification_tray_unittest.cc
+++ b/ash/system/web_notification/web_notification_tray_unittest.cc
@@ -74,6 +74,10 @@ class TestDelegate : public message_center::MessageCenter::Delegate {
virtual void OnClicked(const std::string& notifcation_id) OVERRIDE {
}
+ virtual void OnButtonClicked(const std::string& id,
+ int button_index) OVERRIDE {
+ }
+
void AddNotification(WebNotificationTray* tray, const std::string& id) {
notification_ids_.insert(id);
get_message_center()->AddNotification(
@@ -222,10 +226,8 @@ TEST_F(WebNotificationTrayTest, ManyPopupNotifications) {
EXPECT_EQ(notifications_to_add,
get_message_center()->NotificationCount());
if (message_center::IsRichNotificationEnabled()) {
- NotificationList::Delegate* list_delegate =
- tray->popup_collection_.get()->list_delegate_;
NotificationList::PopupNotifications popups =
- list_delegate->GetNotificationList()->GetPopupNotifications();
+ get_message_center()->notification_list()->GetPopupNotifications();
EXPECT_EQ(NotificationList::kMaxVisiblePopupNotifications, popups.size());
} else {
EXPECT_EQ(NotificationList::kMaxVisiblePopupNotifications,
« no previous file with comments | « no previous file | chrome/browser/extensions/api/notifications/notifications_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698