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

Unified Diff: chrome/browser/chromeos/notifications/notification_browsertest.cc

Issue 7747044: [chromeos] Do not move notifications to KEEP_SIZE state when mouse moved. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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/chromeos/notifications/notification_panel.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/notifications/notification_browsertest.cc
===================================================================
--- chrome/browser/chromeos/notifications/notification_browsertest.cc (revision 97846)
+++ chrome/browser/chromeos/notifications/notification_browsertest.cc (working copy)
@@ -174,8 +174,9 @@
ui_test_utils::RunAllPendingInMessageLoop();
}
-// [CLOSED] -add->[STICKY_AND_NEW] -mouse-> [KEEP_SIZE] -remove/add->
-// [KEEP_SIZE] -remove-> [CLOSED] -add-> [STICKY_AND_NEW] -remove-> [CLOSED]
+// [CLOSED] -add->[STICKY_AND_NEW] -mouse-> [STICKY_AND_NEW] -remove/add->
+// [STICKY_AND_NEW] -remove-> [CLOSED] -add-> [STICKY_AND_NEW] -remove->
+// [CLOSED]
IN_PROC_BROWSER_TEST_F(NotificationTest, TestKeepSizeState) {
BalloonCollectionImpl* collection = GetBalloonCollectionImpl();
NotificationPanel* panel = GetNotificationPanel();
@@ -190,25 +191,25 @@
EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
panel->OnMouseMotion(gfx::Point(10, 10));
- EXPECT_EQ(NotificationPanel::KEEP_SIZE, tester->state());
+ EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
collection->RemoveById("1");
ui_test_utils::RunAllPendingInMessageLoop();
EXPECT_EQ(1, tester->GetNewNotificationCount());
EXPECT_EQ(1, tester->GetNotificationCount());
- EXPECT_EQ(NotificationPanel::KEEP_SIZE, tester->state());
+ EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
collection->Add(NewMockNotification("1"), browser()->profile());
ui_test_utils::RunAllPendingInMessageLoop();
EXPECT_EQ(2, tester->GetNewNotificationCount());
EXPECT_EQ(2, tester->GetNotificationCount());
- EXPECT_EQ(NotificationPanel::KEEP_SIZE, tester->state());
+ EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
collection->RemoveById("1");
ui_test_utils::RunAllPendingInMessageLoop();
EXPECT_EQ(1, tester->GetNewNotificationCount());
EXPECT_EQ(1, tester->GetNotificationCount());
- EXPECT_EQ(NotificationPanel::KEEP_SIZE, tester->state());
+ EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
collection->RemoveById("2");
ui_test_utils::RunAllPendingInMessageLoop();
« no previous file with comments | « no previous file | chrome/browser/chromeos/notifications/notification_panel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698