The 1st patch to disambiguate message center notifications

ash/system/chromeos/session/tray_session_length_limit.cc

 // Copyright 2014 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 "ash/system/chromeos/session/tray_session_length_limit.h"
 
 #include <algorithm>
 
 #include "ash/shell.h"
 #include "ash/system/chromeos/label_tray_view.h"
@@ skipping 105 matching lines @@
   }
 }
 
 void TraySessionLengthLimit::UpdateNotification() {
   message_center::MessageCenter* message_center =
       message_center::MessageCenter::Get();
 
   // If state hasn't changed and the notification has already been acknowledged,
   // we won't re-create it.
   if (limit_state_ == last_limit_state_ &&
-      !message_center->HasNotification(kNotificationId)) {
+      !message_center->FindVisibleNotificationById(kNotificationId)) {
     return;
   }
 
   // After state change, any possibly existing notification is removed to make
   // sure it is re-shown even if it had been acknowledged by the user before
   // (and in the rare case of state change towards LIMIT_NONE to make the
   // notification disappear).
   if (limit_state_ != last_limit_state_ &&
-      message_center->HasNotification(kNotificationId)) {
+      message_center->FindVisibleNotificationById(kNotificationId)) {
     message_center::MessageCenter::Get()->RemoveNotification(
         kNotificationId, false /* by_user */);
   }
 
   // For LIMIT_NONE, there's nothing more to do.
   if (limit_state_ == LIMIT_NONE) {
     last_limit_state_ = limit_state_;
     return;
   }
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   message_center::RichNotificationData data;
   data.should_make_spoken_feedback_for_popup_updates =
       (limit_state_ != last_limit_state_);
   scoped_ptr<message_center::Notification> notification(
       new message_center::Notification(
           message_center::NOTIFICATION_TYPE_SIMPLE,
           kNotificationId,
           base::string16() /* title */,
           ComposeNotificationMessage() /* message */,
           bundle.GetImageNamed(
               IDR_AURA_UBER_TRAY_NOTIFICATION_SESSION_LENGTH_LIMIT),
           base::string16() /* display_source */,
           message_center::NotifierId(
               message_center::NotifierId::SYSTEM_COMPONENT,
               system_notifier::kNotifierSessionLengthTimeout),
           data,
           NULL /* delegate */));
   notification->SetSystemPriority();
-  if (message_center->HasNotification(kNotificationId))
+  if (message_center->FindVisibleNotificationById(kNotificationId))
     message_center->UpdateNotification(kNotificationId, notification.Pass());
   else
     message_center->AddNotification(notification.Pass());
   last_limit_state_ = limit_state_;
 }
 
 void TraySessionLengthLimit::UpdateTrayBubbleView() const {
   if (!tray_bubble_view_)
     return;
   if (limit_state_ == LIMIT_NONE)
@@ skipping 15 matching lines @@
 base::string16 TraySessionLengthLimit::ComposeTrayBubbleMessage() const {
   return l10n_util::GetStringFUTF16(
       IDS_ASH_STATUS_TRAY_BUBBLE_SESSION_LENGTH_LIMIT,
       ui::TimeFormat::Detailed(ui::TimeFormat::FORMAT_DURATION,
                                ui::TimeFormat::LENGTH_LONG,
                                10,
                                remaining_session_time_));
 }
 
 }  // namespace ash