| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/ui/views/message_center/web_notification_tray.h" | 5 #include "chrome/browser/ui/views/message_center/web_notification_tray.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
| 10 #include "ash/system/status_area_widget.h" | 10 #include "ash/system/status_area_widget.h" |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 } | 57 } |
| 58 | 58 |
| 59 private: | 59 private: |
| 60 virtual ~TestNotificationDelegate() {} | 60 virtual ~TestNotificationDelegate() {} |
| 61 | 61 |
| 62 std::string id_; | 62 std::string id_; |
| 63 }; | 63 }; |
| 64 | 64 |
| 65 void AddNotification(const std::string& id, const std::string& replace_id) { | 65 void AddNotification(const std::string& id, const std::string& replace_id) { |
| 66 ::Notification notification(GURL("chrome-extension://abbccedd"), | 66 ::Notification notification(GURL("chrome-extension://abbccedd"), |
| 67 GURL(), | 67 gfx::Image(), |
| 68 base::ASCIIToUTF16("Test Web Notification"), | 68 base::ASCIIToUTF16("Test Web Notification"), |
| 69 base::ASCIIToUTF16( | 69 base::ASCIIToUTF16( |
| 70 "Notification message body."), | 70 "Notification message body."), |
| 71 blink::WebTextDirectionDefault, | 71 blink::WebTextDirectionDefault, |
| 72 base::string16(), | 72 base::string16(), |
| 73 base::ASCIIToUTF16(replace_id), | 73 base::ASCIIToUTF16(replace_id), |
| 74 new TestNotificationDelegate(id)); | 74 new TestNotificationDelegate(id)); |
| 75 | 75 |
| 76 g_browser_process->notification_ui_manager()->Add( | 76 g_browser_process->notification_ui_manager()->Add( |
| 77 notification, browser()->profile()); | 77 notification, browser()->profile()); |
| 78 } | 78 } |
| 79 | 79 |
| 80 void UpdateNotification(const std::string& replace_id, | 80 void UpdateNotification(const std::string& replace_id, |
| 81 const std::string& new_id) { | 81 const std::string& new_id) { |
| 82 ::Notification notification(GURL("chrome-extension://abbccedd"), | 82 ::Notification notification(GURL("chrome-extension://abbccedd"), |
| 83 GURL(""), | 83 gfx::Image(), |
| 84 base::ASCIIToUTF16("Updated Web Notification"), | 84 base::ASCIIToUTF16("Updated Web Notification"), |
| 85 base::ASCIIToUTF16("Updated message body."), | 85 base::ASCIIToUTF16("Updated message body."), |
| 86 blink::WebTextDirectionDefault, | 86 blink::WebTextDirectionDefault, |
| 87 base::string16(), | 87 base::string16(), |
| 88 base::ASCIIToUTF16(replace_id), | 88 base::ASCIIToUTF16(replace_id), |
| 89 new TestNotificationDelegate(new_id)); | 89 new TestNotificationDelegate(new_id)); |
| 90 | 90 |
| 91 g_browser_process->notification_ui_manager()->Add( | 91 g_browser_process->notification_ui_manager()->Add( |
| 92 notification, browser()->profile()); | 92 notification, browser()->profile()); |
| 93 } | 93 } |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 245 base::RunLoop().RunUntilIdle(); | 245 base::RunLoop().RunUntilIdle(); |
| 246 EXPECT_TRUE(tray->status_icon_ == NULL); | 246 EXPECT_TRUE(tray->status_icon_ == NULL); |
| 247 AddNotification("test_id", "replace_id"); | 247 AddNotification("test_id", "replace_id"); |
| 248 base::RunLoop().RunUntilIdle(); | 248 base::RunLoop().RunUntilIdle(); |
| 249 EXPECT_TRUE(tray->status_icon_ != NULL); | 249 EXPECT_TRUE(tray->status_icon_ != NULL); |
| 250 RemoveNotification("test_id"); | 250 RemoveNotification("test_id"); |
| 251 base::RunLoop().RunUntilIdle(); | 251 base::RunLoop().RunUntilIdle(); |
| 252 EXPECT_TRUE(tray->status_icon_ == NULL); | 252 EXPECT_TRUE(tray->status_icon_ == NULL); |
| 253 } | 253 } |
| 254 } // namespace message_center | 254 } // namespace message_center |
| OLD | NEW |