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

Unified Diff: ui/message_center/cocoa/popup_collection_unittest.mm

Issue 15582004: Move NotificationDelegate into message_center. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix the ever-changing Mac unit tests. Created 7 years, 7 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
Index: ui/message_center/cocoa/popup_collection_unittest.mm
diff --git a/ui/message_center/cocoa/popup_collection_unittest.mm b/ui/message_center/cocoa/popup_collection_unittest.mm
index 4f739e3a31b240f1a0fd28631c26ea6a6d703853..c76a1b68311ef4275b3b3e00d43dafac141ac65b 100644
--- a/ui/message_center/cocoa/popup_collection_unittest.mm
+++ b/ui/message_center/cocoa/popup_collection_unittest.mm
@@ -54,6 +54,7 @@ class PopupCollectionTest : public ui::CocoaTest {
" be displayed"),
string16(),
std::string(),
+ NULL,
NULL);
center_->AddNotification(message_center::NOTIFICATION_TYPE_SIMPLE,
"2",
@@ -61,6 +62,7 @@ class PopupCollectionTest : public ui::CocoaTest {
ASCIIToUTF16("This is the second notification."),
string16(),
std::string(),
+ NULL,
NULL);
center_->AddNotification(message_center::NOTIFICATION_TYPE_SIMPLE,
"3",
@@ -72,6 +74,7 @@ class PopupCollectionTest : public ui::CocoaTest {
"set the screen size too small."),
string16(),
std::string(),
+ NULL,
NULL);
WaitForAnimationEnded();
@@ -127,6 +130,7 @@ TEST_F(PopupCollectionTest, AttemptFourOneOffscreen) {
ASCIIToUTF16("This is the fourth notification."),
string16(),
std::string(),
+ NULL,
NULL);
WaitForAnimationEnded();
@@ -172,7 +176,8 @@ TEST_F(PopupCollectionTest, LayoutSpacing) {
ASCIIToUTF16("This is the fourth notification."),
string16(),
std::string(),
- optional.get());
+ optional.get(),
+ NULL);
WaitForAnimationEnded();
EXPECT_TRUE(CheckSpacingBetween([popups objectAtIndex:2],
[popups objectAtIndex:3]));
@@ -205,6 +210,7 @@ TEST_F(PopupCollectionTest, TinyScreen) {
" be displayed"),
string16(),
std::string(),
+ NULL,
NULL);
WaitForAnimationEnded();
EXPECT_EQ(1u, [[collection_ popups] count]);
@@ -221,6 +227,7 @@ TEST_F(PopupCollectionTest, TinyScreen) {
"very very very very very very very "
"very very very very very very very "
"long notification."),
+ NULL,
NULL);
WaitForAnimationEnded();
EXPECT_EQ(0u, [[collection_ popups] count]);
@@ -260,6 +267,7 @@ TEST_F(PopupCollectionTest, UpdateIconAndBody) {
"longer body"),
string16(),
std::string(),
+ NULL,
NULL);
WaitForAnimationEnded();
EXPECT_GT(NSHeight([[controller view] frame]), NSHeight(old_frame));
« no previous file with comments | « ui/message_center/cocoa/notification_controller_unittest.mm ('k') | ui/message_center/cocoa/popup_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698