diff options
Diffstat (limited to 'chrome')
6 files changed, 54 insertions, 19 deletions
diff --git a/chrome/browser/notifications/sync_notifier/chrome_notifier_delegate.cc b/chrome/browser/notifications/sync_notifier/chrome_notifier_delegate.cc index 794cb5f..49f594b 100644 --- a/chrome/browser/notifications/sync_notifier/chrome_notifier_delegate.cc +++ b/chrome/browser/notifications/sync_notifier/chrome_notifier_delegate.cc @@ -65,7 +65,7 @@ void ChromeNotifierDelegate::NavigateToUrl(const GURL& destination) const { void ChromeNotifierDelegate::Close(bool by_user) { if (by_user) - chrome_notifier_->MarkNotificationAsDismissed(notification_id_); + chrome_notifier_->MarkNotificationAsRead(notification_id_); } } // namespace notifier diff --git a/chrome/browser/notifications/sync_notifier/chrome_notifier_delegate_browsertest.cc b/chrome/browser/notifications/sync_notifier/chrome_notifier_delegate_browsertest.cc index d35e532..7532501 100644 --- a/chrome/browser/notifications/sync_notifier/chrome_notifier_delegate_browsertest.cc +++ b/chrome/browser/notifications/sync_notifier/chrome_notifier_delegate_browsertest.cc @@ -34,8 +34,8 @@ class StubChromeNotifierService : public notifier::ChromeNotifierService { virtual ~StubChromeNotifierService() {} - virtual void MarkNotificationAsDismissed(const std::string& id) OVERRIDE { - dismissed_id_ = id; + virtual void MarkNotificationAsRead(const std::string& id) OVERRIDE { + read_id_ = id; } notifier::SyncedNotification* CreateNotification( @@ -62,10 +62,10 @@ class StubChromeNotifierService : public notifier::ChromeNotifierService { kTitle1, kText1, kIconUrl1, kImageUrl1, kAppId1, kKey1, kUnread); } - const std::string& dismissed_id() { return dismissed_id_; } + const std::string& read_id() { return read_id_; } private: - std::string dismissed_id_; + std::string read_id_; }; class ChromeNotifierDelegateBrowserTest : public InProcessBrowserTest {}; @@ -153,8 +153,8 @@ IN_PROC_BROWSER_TEST_F(ChromeNotifierDelegateBrowserTest, CloseTest) { new notifier::ChromeNotifierDelegate(id, ¬ifier); delegate->Close(false); - ASSERT_EQ("", notifier.dismissed_id()); + ASSERT_EQ("", notifier.read_id()); delegate->Close(true); - ASSERT_EQ(kTestNotificationId, notifier.dismissed_id()); + ASSERT_EQ(kTestNotificationId, notifier.read_id()); } diff --git a/chrome/browser/notifications/sync_notifier/chrome_notifier_service.cc b/chrome/browser/notifications/sync_notifier/chrome_notifier_service.cc index cc07213..84b0d6a 100644 --- a/chrome/browser/notifications/sync_notifier/chrome_notifier_service.cc +++ b/chrome/browser/notifications/sync_notifier/chrome_notifier_service.cc @@ -102,7 +102,12 @@ syncer::SyncMergeResult ChromeNotifierService::MergeDataAndStartSyncing( if (incoming->GetReadState() == SyncedNotification::kDismissed) { // If it is marked as read on the server, but not the client. found->NotificationHasBeenDismissed(); - // Tell the Notification UI Manager to mark it read. + // Tell the Notification UI Manager to remove it. + notification_manager_->CancelById(found->GetKey()); + } else if (incoming->GetReadState() == SyncedNotification::kRead) { + // If it is marked as read on the server, but not the client. + found->NotificationHasBeenRead(); + // Tell the Notification UI Manager to remove it. notification_manager_->CancelById(found->GetKey()); } else { // If it is marked as read on the client, but not the server. @@ -225,12 +230,16 @@ scoped_ptr<SyncedNotification> return scoped_ptr<SyncedNotification>(); } - // TODO(petewil): Is this the right set? Should I add more? bool is_well_formed_unread_notification = (static_cast<SyncedNotification::ReadState>( specifics.coalesced_notification().read_state()) == SyncedNotification::kUnread && specifics.coalesced_notification().has_render_info()); + bool is_well_formed_read_notification = + (static_cast<SyncedNotification::ReadState>( + specifics.coalesced_notification().read_state()) == + SyncedNotification::kRead && + specifics.coalesced_notification().has_render_info()); bool is_well_formed_dismissed_notification = (static_cast<SyncedNotification::ReadState>( specifics.coalesced_notification().read_state()) == @@ -238,12 +247,15 @@ scoped_ptr<SyncedNotification> // If the notification is poorly formed, return a null pointer. if (!is_well_formed_unread_notification && + !is_well_formed_read_notification && !is_well_formed_dismissed_notification) { DVLOG(1) << "Synced Notification is not well formed." << " unread well formed? " << is_well_formed_unread_notification << " dismissed well formed? " - << is_well_formed_dismissed_notification; + << is_well_formed_dismissed_notification + << " read well formed? " + << is_well_formed_read_notification; return scoped_ptr<SyncedNotification>(); } @@ -305,13 +317,13 @@ void ChromeNotifierService::GetSyncedNotificationServices( notifiers->push_back(notifier_service); } -void ChromeNotifierService::MarkNotificationAsDismissed( +void ChromeNotifierService::MarkNotificationAsRead( const std::string& key) { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); SyncedNotification* notification = FindNotificationById(key); CHECK(notification != NULL); - notification->NotificationHasBeenDismissed(); + notification->NotificationHasBeenRead(); syncer::SyncChangeList new_changes; syncer::SyncData sync_data = CreateSyncDataFromNotification(*notification); @@ -345,19 +357,21 @@ void ChromeNotifierService::Add(scoped_ptr<SyncedNotification> notification) { void ChromeNotifierService::AddForTest( scoped_ptr<notifier::SyncedNotification> notification) { - notification_data_.push_back(notification.release()); - } + notification_data_.push_back(notification.release()); +} void ChromeNotifierService::Display(SyncedNotification* notification) { // If the feature is disabled, exit now. if (!notifier::ChromeNotifierServiceFactory::UseSyncedNotifications( - CommandLine::ForCurrentProcess())) + CommandLine::ForCurrentProcess())) return; + notification->LogNotification(); + // Set up to fetch the bitmaps. notification->QueueBitmapFetchJobs(notification_manager_, - this, - profile_); + this, + profile_); // Our tests cannot use the network for reliability reasons. if (avoid_bitmap_fetching_for_test_) { diff --git a/chrome/browser/notifications/sync_notifier/chrome_notifier_service.h b/chrome/browser/notifications/sync_notifier/chrome_notifier_service.h index 13a21f0ec..fdbd7f1 100644 --- a/chrome/browser/notifications/sync_notifier/chrome_notifier_service.h +++ b/chrome/browser/notifications/sync_notifier/chrome_notifier_service.h @@ -67,7 +67,7 @@ class ChromeNotifierService : public syncer::SyncableService, // Called when we dismiss a notification. This is virtual so that test // subclasses can override it. - virtual void MarkNotificationAsDismissed(const std::string& id); + virtual void MarkNotificationAsRead(const std::string& id); // Called when a notier is enabled or disabled. void OnSyncedNotificationServiceEnabled( diff --git a/chrome/browser/notifications/sync_notifier/synced_notification.cc b/chrome/browser/notifications/sync_notifier/synced_notification.cc index 5c427ff..abffe93 100644 --- a/chrome/browser/notifications/sync_notifier/synced_notification.cc +++ b/chrome/browser/notifications/sync_notifier/synced_notification.cc @@ -191,7 +191,7 @@ void SyncedNotification::Show(NotificationUIManager* notification_manager, if (SyncedNotification::kRead == GetReadState() || SyncedNotification::kDismissed == GetReadState() ) { notification_manager->CancelById(GetKey()); - DVLOG(2) << "Dismissed notification arrived" + DVLOG(2) << "Dismissed or read notification arrived" << GetHeading() << " " << GetText(); return; } @@ -376,6 +376,19 @@ bool SyncedNotification::EqualsIgnoringReadState( return false; } +void SyncedNotification::LogNotification() { + std::string readStateString("Unread"); + if (SyncedNotification::kRead == GetReadState()) + readStateString = "Read"; + else if (SyncedNotification::kDismissed == GetReadState()) + readStateString = "Dismissed"; + + DVLOG(2) << " Notification: Heading is " << GetHeading() + << " description is " << GetDescription() + << " key is " << GetKey() + << " read state is " << readStateString; +} + // Set the read state on the notification, returns true for success. void SyncedNotification::SetReadState(const ReadState& read_state) { @@ -393,6 +406,10 @@ void SyncedNotification::SetReadState(const ReadState& read_state) { NOTREACHED(); } +void SyncedNotification::NotificationHasBeenRead() { + SetReadState(kRead); +} + void SyncedNotification::NotificationHasBeenDismissed() { SetReadState(kDismissed); } diff --git a/chrome/browser/notifications/sync_notifier/synced_notification.h b/chrome/browser/notifications/sync_notifier/synced_notification.h index cba6863..0a6842d 100644 --- a/chrome/browser/notifications/sync_notifier/synced_notification.h +++ b/chrome/browser/notifications/sync_notifier/synced_notification.h @@ -79,6 +79,7 @@ class SyncedNotification : public NotificationBitmapFetcherDelegate { bool EqualsIgnoringReadState(const SyncedNotification& other) const; + void NotificationHasBeenRead(); void NotificationHasBeenDismissed(); // Fill up the queue of bitmaps to fetch. @@ -99,6 +100,9 @@ class SyncedNotification : public NotificationBitmapFetcherDelegate { // of the sync data. sync_pb::EntitySpecifics GetEntitySpecifics() const; + // Write a notification to the console log. + void LogNotification(); + private: // Helper function to mark a notification as read or dismissed. void SetReadState(const ReadState& read_state); |