Remove notifications.onDisplayed.

Removed onDisplayed completely from chrome.notifications and
ensured the onDisplay event fires correctly with the message
center for Webkit notifications.

BUG=196290

Review URL: https://chromiumcodereview.appspot.com/13925017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195679 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 18 insertions, 0 deletions

diff --git a/ui/message_center/fake_message_center.cc b/ui/message_center/fake_message_center.cc
index e5a0c3a..de58281 100644
--- a/ui/message_center/fake_message_center.cc
+++ b/ui/message_center/fake_message_center.cc
@@ -117,6 +117,9 @@ void FakeMessageCenter::MarkSinglePopupAsShown(const std::string& id,
                                                bool mark_notification_as_read) {
 }
 
+void FakeMessageCenter::DisplayedNotification(const std::string& id) {
+}
+
 void FakeMessageCenter::SetQuietMode(bool in_quiet_mode) {
 }
 
diff --git a/ui/message_center/fake_message_center.h b/ui/message_center/fake_message_center.h
index f1cfc36..bf7d435 100644
--- a/ui/message_center/fake_message_center.h
+++ b/ui/message_center/fake_message_center.h
@@ -61,6 +61,7 @@ class FakeMessageCenter : public MessageCenter {
                                          int button_index) OVERRIDE;
   virtual void MarkSinglePopupAsShown(const std::string& id,
                                       bool mark_notification_as_read) OVERRIDE;
+  virtual void DisplayedNotification(const std::string& id) OVERRIDE;
   virtual void SetQuietMode(bool in_quiet_mode) OVERRIDE;
   virtual void EnterQuietModeWithExpire(
       const base::TimeDelta& expires_in) OVERRIDE;
diff --git a/ui/message_center/message_center.h b/ui/message_center/message_center.h
index df6280c..654e766 100644
--- a/ui/message_center/message_center.h
+++ b/ui/message_center/message_center.h
@@ -140,6 +140,7 @@ class MESSAGE_CENTER_EXPORT MessageCenter {
                                          int button_index) = 0;
   virtual void MarkSinglePopupAsShown(const std::string& id,
                                       bool mark_notification_as_read) = 0;
+  virtual void DisplayedNotification(const std::string& id) = 0;
   virtual void SetQuietMode(bool in_quiet_mode) = 0;
   virtual void EnterQuietModeWithExpire(const base::TimeDelta& expires_in) = 0;
   // Informs the notification list whether the message center is visible.
diff --git a/ui/message_center/message_center_impl.cc b/ui/message_center/message_center_impl.cc
index 22ed7e5..8789b74 100644
--- a/ui/message_center/message_center_impl.cc
+++ b/ui/message_center/message_center_impl.cc
@@ -252,6 +252,11 @@ void MessageCenterImpl::MarkSinglePopupAsShown(const std::string& id,
                     OnNotificationUpdated(id));
 }
 
+void MessageCenterImpl::DisplayedNotification(const std::string& id) {
+  FOR_EACH_OBSERVER(MessageCenterObserver, observer_list_,
+                    OnNotificationDisplayed(id));
+}
+
 void MessageCenterImpl::SetQuietMode(bool in_quiet_mode) {
   notification_list_->SetQuietMode(in_quiet_mode);
 }
diff --git a/ui/message_center/message_center_impl.h b/ui/message_center/message_center_impl.h
index 6668087..3e3672d 100644
--- a/ui/message_center/message_center_impl.h
+++ b/ui/message_center/message_center_impl.h
@@ -62,6 +62,7 @@ class MessageCenterImpl : public MessageCenter {
                                          int button_index) OVERRIDE;
   virtual void MarkSinglePopupAsShown(const std::string& id,
                                       bool mark_notification_as_read) OVERRIDE;
+  virtual void DisplayedNotification(const std::string& id) OVERRIDE;
   virtual void SetQuietMode(bool in_quiet_mode) OVERRIDE;
   virtual void EnterQuietModeWithExpire(
       const base::TimeDelta& expires_in) OVERRIDE;
diff --git a/ui/message_center/message_center_observer.h b/ui/message_center/message_center_observer.h
index 54255ab..4c5d632 100644
--- a/ui/message_center/message_center_observer.h
+++ b/ui/message_center/message_center_observer.h
@@ -34,6 +34,10 @@ class MESSAGE_CENTER_EXPORT MessageCenterObserver {
   virtual void OnNotificationButtonClicked(const std::string& notification_id,
                                            int button_index) {}
 
+  // Called when the notification associated with |notification_id| is actually
+  // displayed.
+  virtual void OnNotificationDisplayed(const std::string& notification_id) {}
+
  protected:
   virtual ~MessageCenterObserver() {}
 };
diff --git a/ui/message_center/views/message_center_view.cc b/ui/message_center/views/message_center_view.cc
index f6b519f..01f97c3 100644
--- a/ui/message_center/views/message_center_view.cc
+++ b/ui/message_center/views/message_center_view.cc
@@ -449,6 +449,7 @@ void MessageCenterView::AddNotification(const Notification& notification) {
   view->set_scroller(scroller_);
   message_views_[notification.id()] = view;
   message_list_view_->AddChildView(view);
+  message_center_->DisplayedNotification(notification.id());
 }
 
 }  // namespace message_center
diff --git a/ui/message_center/views/message_popup_collection.cc b/ui/message_center/views/message_popup_collection.cc
index fb44144..e9763d5 100644
--- a/ui/message_center/views/message_popup_collection.cc
+++ b/ui/message_center/views/message_popup_collection.cc
@@ -232,6 +232,8 @@ void MessagePopupCollection::UpdateWidgets() {
     widget->SetBounds(bounds);
     widget->Show();
     bottom -= view_height + kToastMargin;
+
+    message_center_->DisplayedNotification((*iter)->id());
   }
 }