Increase Web Notification timeout to 20 seconds

ui/message_center/popup_timer.cc

 // Copyright (c) 2015 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/popup_timer.h"
 
 #include <algorithm>
 
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/message_center_types.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_list.h"
 
+namespace message_center {
+
 namespace {
 
-base::TimeDelta GetTimeoutForPriority(int priority) {
-  if (priority > message_center::DEFAULT_PRIORITY) {
-    return base::TimeDelta::FromSeconds(
-        message_center::kAutocloseHighPriorityDelaySeconds);
-  }
-  return base::TimeDelta::FromSeconds(
-      message_center::kAutocloseDefaultDelaySeconds);
+base::TimeDelta GetTimeoutForNotification(Notification* notification) {
+  if (notification->priority() > message_center::DEFAULT_PRIORITY)
+    return base::TimeDelta::FromSeconds(kAutocloseHighPriorityDelaySeconds);
+  if (notification->is_web_notification())
+    return base::TimeDelta::FromSeconds(kAutocloseWebNotificationDelaySeconds);
+  return base::TimeDelta::FromSeconds(kAutocloseDefaultDelaySeconds);
 }
 
 }  // namespace
 
-namespace message_center {
-
 ////////////////////////////////////////////////////////////////////////////////
 // PopupTimer
 
 PopupTimer::PopupTimer(const std::string& id,
                        base::TimeDelta timeout,
                        base::WeakPtr<PopupTimersController> controller)
     : id_(id),
       timeout_(timeout),
       timer_controller_(controller),
       timer_(new base::OneShotTimer) {}
@@ skipping 119 matching lines @@
       break;
   }
 
   if (iter == popup_notifications.end() || (*iter)->never_timeout()) {
     CancelTimer(id);
     return;
   }
 
   // Start the timer if not yet.
   if (popup_timers_.find(id) == popup_timers_.end())
-    StartTimer(id, GetTimeoutForPriority((*iter)->priority()));
+    StartTimer(id, GetTimeoutForNotification(*iter));
 }
 
 void PopupTimersController::OnNotificationRemoved(const std::string& id,
                                                   bool by_user) {
   CancelTimer(id);
 }
 
 }  // namespace message_center