diff options
Diffstat (limited to 'chrome/browser')
4 files changed, 7 insertions, 18 deletions
diff --git a/chrome/browser/extensions/api/notifications/notifications_apitest.cc b/chrome/browser/extensions/api/notifications/notifications_apitest.cc index 523643d..27bb6f3 100644 --- a/chrome/browser/extensions/api/notifications/notifications_apitest.cc +++ b/chrome/browser/extensions/api/notifications/notifications_apitest.cc @@ -283,18 +283,6 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestByUser) { true); EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); } - - { - ResultCatcher catcher; - g_browser_process->message_center()->SendRemoveAllNotifications(false); - EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); - } - - { - ResultCatcher catcher; - g_browser_process->message_center()->SendRemoveAllNotifications(true); - EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); - } } #endif diff --git a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc index 220885c..af461a7 100644 --- a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc +++ b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc @@ -125,11 +125,11 @@ class MessageCenterExtensionCrashRecoveryTest message_center::MessageCenter::Get(); ASSERT_GT(message_center->NotificationCount(), index); message_center::NotificationList::Notifications::reverse_iterator it = - message_center->GetNotificationList()->GetNotifications().rbegin(); + message_center->notification_list()->GetNotifications().rbegin(); for (size_t i=0; i < index; ++i) it++; std::string id = (*it)->id(); - message_center->OnNotificationClicked(id); + message_center->OnClicked(id); WaitForExtensionLoad(); } @@ -138,7 +138,7 @@ class MessageCenterExtensionCrashRecoveryTest message_center::MessageCenter::Get(); ASSERT_GT(message_center->NotificationCount(), index); message_center::NotificationList::Notifications::reverse_iterator it = - message_center->GetNotificationList()->GetNotifications().rbegin(); + message_center->notification_list()->GetNotifications().rbegin(); for (size_t i=0; i < index; i++) { it++; } ASSERT_TRUE( g_browser_process->notification_ui_manager()->CancelById((*it)->id())); diff --git a/chrome/browser/notifications/message_center_notification_manager.cc b/chrome/browser/notifications/message_center_notification_manager.cc index 347f26b..38d1995 100644 --- a/chrome/browser/notifications/message_center_notification_manager.cc +++ b/chrome/browser/notifications/message_center_notification_manager.cc @@ -141,7 +141,7 @@ bool MessageCenterNotificationManager::UpdateNotification( old_notification->profile()->IsSameProfile(profile)) { std::string old_id = old_notification->notification().notification_id(); - DCHECK(message_center_->GetNotificationList()->HasNotification(old_id)); + DCHECK(message_center_->notification_list()->HasNotification(old_id)); // Add/remove notification in the local list but just update the same // one in MessageCenter. diff --git a/chrome/browser/ui/views/message_center/web_notification_tray_win_browsertest.cc b/chrome/browser/ui/views/message_center/web_notification_tray_win_browsertest.cc index b7c9c39..efe5429 100644 --- a/chrome/browser/ui/views/message_center/web_notification_tray_win_browsertest.cc +++ b/chrome/browser/ui/views/message_center/web_notification_tray_win_browsertest.cc @@ -52,9 +52,10 @@ class TestDelegate : public message_center::MessageCenter::Delegate { virtual void DisableExtension(const std::string& notification_id) OVERRIDE { } virtual void ShowSettings(const std::string& notification_id) OVERRIDE { } - virtual void OnClicked(const std::string& notification_id) OVERRIDE { } virtual void ShowSettingsDialog(gfx::NativeView context) OVERRIDE { } - + virtual void OnClicked(const std::string& notification_id) OVERRIDE { } + virtual void OnButtonClicked(const std::string& id, + int button_index) OVERRIDE {} void AddNotification(const std::string& id) { notification_ids_.insert(id); |