Implement Non-Closable Notification

ui/message_center/views/message_popup_collection.cc

 // Copyright (c) 2013 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/views/message_popup_collection.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
@@ skipping 65 matching lines @@
 }
 
 void MessagePopupCollection::ClickOnNotification(
     const std::string& notification_id) {
   message_center_->ClickOnNotification(notification_id);
 }
 
 void MessagePopupCollection::RemoveNotification(
     const std::string& notification_id,
     bool by_user) {
-  message_center_->RemoveNotification(notification_id, by_user);
+
+  NotificationList::PopupNotifications notifications =
+      message_center_->GetPopupNotifications();
+  for (NotificationList::PopupNotifications::iterator iter =
+           notifications.begin(); iter != notifications.end(); ++iter) {
+    Notification* notification = *iter;
+    DCHECK(notification);
+
+    if (notification->id() != notification_id)
+      continue;
+
+    // Don't remove the notification only when it's not closable.
+    if (notification->closable())

[dewittj, 2016/02/03 19:31:37]

Should there be an else clause, something like
"MarkSinglePopupAsShown(notification_id)" so it goes to the NC

[yoshiki, 2016/02/07 17:49:41]

Good point. Done.

+      message_center_->RemoveNotification(notification_id, by_user);
+
+    break;
+  }
 }
 
 scoped_ptr<ui::MenuModel> MessagePopupCollection::CreateMenuModel(
     const NotifierId& notifier_id,
     const base::string16& display_source) {
   return tray_->CreateNotificationMenuModel(notifier_id, display_source);
 }
 
 bool MessagePopupCollection::HasClickedListener(
     const std::string& notification_id) {
@@ skipping 35 matching lines @@
   bool top_down = alignment_delegate_->IsTopDown();
   int base = GetBaseLine(toasts_.empty() ? NULL : toasts_.back());
 
   // Iterate in the reverse order to keep the oldest toasts on screen. Newer
   // items may be ignored if there are no room to place them.
   for (NotificationList::PopupNotifications::const_reverse_iterator iter =
            popups.rbegin(); iter != popups.rend(); ++iter) {
     if (FindToast((*iter)->id()))
       continue;
 
+    Notification notification = *(*iter);
+    // Override closable status, since toasts should be closable even when it's
+    // non-closable.
+    notification.set_closable(true);
     NotificationView* view =
         NotificationView::Create(NULL,
-                                 *(*iter),
+                                 notification,
                                  true); // Create top-level notification.
     view->set_context_menu_controller(context_menu_controller_.get());
     int view_height = ToastContentsView::GetToastSizeForView(view).height();
     int height_available =
         top_down ? alignment_delegate_->GetWorkAreaBottom() - base : base;
 
     if (height_available - view_height - kToastMarginY < 0) {
       delete view;
       break;
     }
@@ skipping 354 matching lines @@
       views::Widget* widget = (*iter)->GetWidget();
       if (widget)
         return widget->GetWindowBoundsInScreen();
       break;
     }
   }
   return gfx::Rect();
 }
 
 }  // namespace message_center