Show message center on lock screen

ui/message_center/notification_list.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/notification_list.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "ui/gfx/image/image.h"
+#include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_blocker.h"
 #include "ui/message_center/notification_types.h"
 
 namespace message_center {
 
 namespace {
 
 bool ShouldShowNotificationAsPopup(
@@ skipping 22 matching lines @@
     return true;
   if (n1->timestamp() < n2->timestamp())
     return false;
   if (n1->serial_number() > n2->serial_number())  // Newer come first.
     return true;
   if (n1->serial_number() < n2->serial_number())
     return false;
   return false;
 }
 
-NotificationList::NotificationList()
-    : message_center_visible_(false),
+NotificationList::NotificationList(MessageCenter* message_center)
+    : message_center_(message_center),
       quiet_mode_(false) {
 }
 
 NotificationList::~NotificationList() {
   STLDeleteContainerPointers(notifications_.begin(), notifications_.end());
 }
 
-void NotificationList::SetMessageCenterVisible(
-    bool visible,
+void NotificationList::SetNotificationsShown(
+    const NotificationBlockers& blockers,
     std::set<std::string>* updated_ids) {
-  if (message_center_visible_ == visible)
-    return;
+  Notifications notifications = GetVisibleNotifications(blockers);
 
-  message_center_visible_ = visible;
-
-  if (!visible)
-    return;
-
-  for (Notifications::iterator iter = notifications_.begin();
-       iter != notifications_.end(); ++iter) {
+  for (auto iter = notifications.begin(); iter != notifications.end(); ++iter) {
     Notification* notification = *iter;
     bool was_popup = notification->shown_as_popup();
     bool was_read = notification->IsRead();
     if (notification->priority() < SYSTEM_PRIORITY)
       notification->set_shown_as_popup(true);
     notification->set_is_read(true);
     if (updated_ids && !(was_popup && was_read))
       updated_ids->insert(notification->id());
   }
 }
@@ skipping 250 matching lines @@
   if (iter != notifications_.end()) {
     notification->CopyState(*iter);
     state_inherited = true;
     EraseNotification(iter);
   }
   // Add the notification to the the list and mark it unread and unshown.
   if (!state_inherited) {
     // TODO(mukai): needs to distinguish if a notification is dismissed by
     // the quiet mode or user operation.
     notification->set_is_read(false);
-    notification->set_shown_as_popup(message_center_visible_
+    notification->set_shown_as_popup(message_center_->IsMessageCenterVisible()

[dewittj, 2016/05/24 17:10:29]

This is ok for now, but I'd rather the notification already get its
shown_as_popup bit set before it's put onto the notification list one eday.

[yoshiki, 2016/05/25 09:13:59]

Got it. Let me consider a good way.

                                      || quiet_mode_
                                      || notification->shown_as_popup());
   }
   // Take ownership. The notification can only be removed from the list
   // in EraseNotification(), which will delete it.
   notifications_.insert(notification.release());
 }
 
 }  // namespace message_center