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

Side by Side Diff: ash/system/web_notification/web_notification_tray_unittest.cc

Issue 10855079: Fix Ash notification updates (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/system/web_notification/web_notification_tray.h" 5 #include "ash/system/web_notification/web_notification_tray.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/system/status_area_widget.h" 9 #include "ash/system/status_area_widget.h"
10 #include "ash/system/tray/system_tray_item.h" 10 #include "ash/system/tray/system_tray_item.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 notification_ids_.insert(id); 50 notification_ids_.insert(id);
51 tray->AddNotification(id, 51 tray->AddNotification(id,
52 ASCIIToUTF16("Test Web Notification"), 52 ASCIIToUTF16("Test Web Notification"),
53 ASCIIToUTF16("Notification message body."), 53 ASCIIToUTF16("Notification message body."),
54 ASCIIToUTF16("www.test.org"), 54 ASCIIToUTF16("www.test.org"),
55 "" /* extension id */); 55 "" /* extension id */);
56 } 56 }
57 57
58 void RemoveNotification(WebNotificationTray* tray, const std::string& id) { 58 void RemoveNotification(WebNotificationTray* tray, const std::string& id) {
59 tray->RemoveNotification(id); 59 tray->RemoveNotification(id);
60 notification_ids_.erase(id);
60 } 61 }
61 62
62 bool HasNotificationId(const std::string& id) { 63 bool HasNotificationId(const std::string& id) {
63 return notification_ids_.find(id) != notification_ids_.end(); 64 return notification_ids_.find(id) != notification_ids_.end();
64 } 65 }
65 66
66 private: 67 private:
67 std::set<std::string> notification_ids_; 68 std::set<std::string> notification_ids_;
68 69
69 DISALLOW_COPY_AND_ASSIGN(TestDelegate); 70 DISALLOW_COPY_AND_ASSIGN(TestDelegate);
(...skipping 24 matching lines...) Expand all
94 EXPECT_FALSE(delegate->HasNotificationId("test_id2")); 95 EXPECT_FALSE(delegate->HasNotificationId("test_id2"));
95 EXPECT_EQ(1, tray->GetNotificationCount()); 96 EXPECT_EQ(1, tray->GetNotificationCount());
96 97
97 // Removing the last notification should hide the bubble. 98 // Removing the last notification should hide the bubble.
98 delegate->RemoveNotification(tray, "test_id1"); 99 delegate->RemoveNotification(tray, "test_id1");
99 EXPECT_EQ(0, tray->GetNotificationCount()); 100 EXPECT_EQ(0, tray->GetNotificationCount());
100 EXPECT_TRUE(tray->notification_bubble() == NULL); 101 EXPECT_TRUE(tray->notification_bubble() == NULL);
101 } 102 }
102 103
103 } // namespace ash 104 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698