Made notification center notifications collapsed and expandable.

ui/message_center/message_center.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/message_center/message_center.h"
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/observer_list.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_list.h"
 
 namespace message_center {
 
+MessageCenter::Delegate::~Delegate() {
+}

[dharcourt, 2013/03/02 02:08:02]

To avoid an "undefined reference to vtable..." link error, at least one
non-inline non-fully-virtual method must be defined. In this and other
delegates, the destructor fulfills that role.

+
 //------------------------------------------------------------------------------
 MessageCenter::MessageCenter()
     : delegate_(NULL) {
   notification_list_.reset(new NotificationList(this));
 }
 
 MessageCenter::~MessageCenter() {
   notification_list_.reset();
 }
 
@@ skipping 71 matching lines @@
 
 void MessageCenter::SetNotificationButtonIcon(
     const std::string& notification_id, int button_index,
     const gfx::ImageSkia& image) {
   if (notification_list_->SetNotificationButtonIcon(notification_id,
                                                     button_index, image))
     NotifyMessageCenterChanged(true);
 }
 
 //------------------------------------------------------------------------------
-// Overridden from NotificationList::Delegate.
+// Overridden from NotificationChangeDelegate:
 
-void MessageCenter::SendRemoveNotification(const std::string& id,
-                                           bool by_user) {
+void MessageCenter::RemoveNotification(const std::string& id, bool by_user) {
   if (delegate_)
     delegate_->NotificationRemoved(id, by_user);
 }
 
-void MessageCenter::SendRemoveAllNotifications(bool by_user) {
+void MessageCenter::RemoveAllNotifications(bool by_user) {
   if (delegate_) {
     const NotificationList::Notifications& notifications =
         notification_list_->GetNotifications();
     for (NotificationList::Notifications::const_iterator loopiter =
              notifications.begin();
          loopiter != notifications.end(); ) {
       NotificationList::Notifications::const_iterator curiter = loopiter++;
       std::string notification_id = (*curiter)->id();
       // May call RemoveNotification and erase curiter.
       delegate_->NotificationRemoved(notification_id, by_user);
     }
   }
 }
 
-void MessageCenter::DisableNotificationByExtension(
+void MessageCenter::DisableNotificationsByExtension(
     const std::string& id) {
   if (delegate_)
     delegate_->DisableExtension(id);
   // When we disable notifications, we remove any existing matching
   // notifications to avoid adding complicated UI to re-enable the source.
   notification_list_->SendRemoveNotificationsByExtension(id);
 }
 
-void MessageCenter::DisableNotificationByUrl(const std::string& id) {
+void MessageCenter::DisableNotificationsByUrl(const std::string& id) {
   if (delegate_)
     delegate_->DisableNotificationsFromSource(id);
   notification_list_->SendRemoveNotificationsBySource(id);
 }
 
 void MessageCenter::ShowNotificationSettings(const std::string& id) {
   if (delegate_)
     delegate_->ShowSettings(id);
 }
 
 void MessageCenter::ShowNotificationSettingsDialog(gfx::NativeView context) {
   if (delegate_)
     delegate_->ShowSettingsDialog(context);
 }
 
-void MessageCenter::OnNotificationClicked(const std::string& id) {
+void MessageCenter::OnExpanded(const std::string& id) {
+  notification_list_->MarkNotificationAsExpanded(id);
+}
+
+void MessageCenter::OnClicked(const std::string& id) {
   if (delegate_)
     delegate_->OnClicked(id);
   if (HasPopupNotifications()) {
     notification_list_->MarkSinglePopupAsShown(id, true);
     NotifyMessageCenterChanged(false);
   }
 }
 
-void MessageCenter::OnQuietModeChanged(bool quiet_mode) {
-  NotifyMessageCenterChanged(true);
-}
-
 void MessageCenter::OnButtonClicked(const std::string& id, int button_index) {
   if (delegate_)
     delegate_->OnButtonClicked(id, button_index);
   if (HasPopupNotifications()) {
     notification_list_->MarkSinglePopupAsShown(id, true);
     NotifyMessageCenterChanged(false);
   }
 }
 
-NotificationList* MessageCenter::GetNotificationList() {
-  return notification_list_.get();
+//------------------------------------------------------------------------------
+// Overridden from NotificationList::Delegate:
+
+void MessageCenter::NotificationWasRemoved(const std::string& id,
+                                           bool by_user) {
+  RemoveNotification(id, by_user);
 }
 
-void MessageCenter::Delegate::OnButtonClicked(const std::string& id,
-                                              int button_index) {
+void MessageCenter::AllNotificationsWereRemoved(bool by_user) {
+  RemoveAllNotifications(by_user);
+}
+
+void MessageCenter::OnQuietModeChanged(bool quiet_mode) {
+  NotifyMessageCenterChanged(true);
 }
 
 //------------------------------------------------------------------------------
 // Private.
 
 void MessageCenter::NotifyMessageCenterChanged(bool new_notification) {
   FOR_EACH_OBSERVER(Observer,
                     observer_list_,
                     OnMessageCenterChanged(new_notification));
 }
 
 
 }  // namespace message_center