Increase Web Notification timeout to 20 seconds

ui/message_center/notification.h

 // 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.
 
 #ifndef UI_MESSAGE_CENTER_NOTIFICATION_H_
 #define UI_MESSAGE_CENTER_NOTIFICATION_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 23 matching lines @@
   ButtonInfo(const base::string16& title);
 };
 
 class MESSAGE_CENTER_EXPORT RichNotificationData {
  public:
   RichNotificationData();
   RichNotificationData(const RichNotificationData& other);
   ~RichNotificationData();
 
   int priority;
+  bool is_web_notification;
   bool never_timeout;
   base::Time timestamp;
   base::string16 context_message;
   gfx::Image image;
   gfx::Image small_image;
   std::vector<NotificationItem> items;
   int progress;
   std::vector<ButtonInfo> buttons;
   bool should_make_spoken_feedback_for_popup_updates;
   bool clickable;
@@ skipping 14 matching lines @@
                const RichNotificationData& optional_fields,
                NotificationDelegate* delegate);
 
   Notification(const std::string& id, const Notification& other);
 
   Notification(const Notification& other);
 
   virtual ~Notification();
 
   // Copies the internal on-memory state from |base|, i.e. shown_as_popup,
-  // is_read, and never_timeout.
+  // is_read, is_web_notification and never_timeout.
   void CopyState(Notification* base);
 
   NotificationType type() const { return type_; }
   void set_type(NotificationType type) { type_ = type; }
 
   // Uniquely identifies a notification in the message center. For
   // notification front ends that support multiple profiles, this id should
   // identify a unique profile + frontend_notification_id combination. You can
   // Use this id against the MessageCenter interface but not the
   // NotificationUIManager interface.
@@ skipping 97 matching lines @@
   }
 
   // Read status in the message center.
   bool IsRead() const;
   void set_is_read(bool read) { is_read_ = read; }
 
   // Used to keep the order of notifications with the same timestamp.
   // The notification with lesser serial_number is considered 'older'.
   unsigned serial_number() { return serial_number_; }
 
-  // Marks this explicitly to prevent the timeout dismiss of notification.
-  // This is used by webkit notifications to keep the existing behavior.
+  // Gets and sets whether this was shown using the Web Notifications API.
+  bool is_web_notification() const {
+    return optional_fields_.is_web_notification;
+  }
+  void set_is_web_notification(bool is_web_notification) {
+    optional_fields_.is_web_notification = is_web_notification;

[Peter Beverloo, 2015/10/08 07:23:06]

why can't we use notifier_id_type==NotifierId::WEB_PAGE?

+  }
+
+  // Gets and sets whether the notifiction should remain onscreen permanently.
+  bool never_timeout() const { return optional_fields_.never_timeout; }
   void set_never_timeout(bool never_timeout) {
     optional_fields_.never_timeout = never_timeout;
   }
 
-  bool never_timeout() const { return optional_fields_.never_timeout; }
-
   bool clickable() const { return optional_fields_.clickable; }
   void set_clickable(bool clickable) {
     optional_fields_.clickable = clickable;
   }
 
   NotificationDelegate* delegate() const { return delegate_.get(); }
 
   const RichNotificationData& rich_notification_data() const {
     return optional_fields_;
   }
@@ skipping 52 matching lines @@
   bool is_read_;  // True if this has been seen in the message center.
 
   // A proxy object that allows access back to the JavaScript object that
   // represents the notification, for firing events.
   scoped_refptr<NotificationDelegate> delegate_;
 };
 
 }  // namespace message_center
 
 #endif  // UI_MESSAGE_CENTER_NOTIFICATION_H_