Issue 2368 - Update adblockplus dependency to revision feb391127fe4

lib/notificationHelper.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 111 matching lines @@
 
   chrome.notifications.onButtonClicked.addListener(function(notificationId, buttonIndex)
   {
     notificationButtonClick(buttonIndex);
     clearActiveNotification(notificationId);
   });
   chrome.notifications.onClicked.addListener(clearActiveNotification);
   chrome.notifications.onClosed.addListener(notificationClosed);
 }
 
-/**
- * Initializes the notification system.
- */
-exports.initNotifications = function()
+function showNotification(notification)
 {
-  if (canUseChromeNotifications)
-    initChromeNotifications();
-  initAntiAdblockNotification();
-};
-
-let showNextNotification =
-/**
- * Shows the next notification from the queue if any.
- *
- * @param {URL} [url] URL to match notifications to
- */
-exports.showNextNotification = function(url)
-{
-  let notification = NotificationStorage.getNextToShow(url && stringifyURL(url));
   if (!notification || activeNotification && activeNotification.id == notification.id)
     return;
 
   activeNotification = notification;
   if (activeNotification.type == "critical" || activeNotification.type == "question")
   {
     let texts = NotificationStorage.getLocalizedTexts(notification);
     let title = texts.title || "";
     let message = texts.message ? texts.message.replace(/<\/?(a|strong)>/g, "") : "";
     let iconUrl = ext.getURL("icons/detailed/abp-128.png");
@@ skipping 59 matching lines @@
       if (activeNotification.type == "question")
         notificationButtonClick(approved ? 0 : 1);
       else if (approved)
         openNotificationLinks();
     }
   }
   prepareNotificationIconAndPopup();
 };
 
 /**
+ * Initializes the notification system.
+ */
+exports.initNotifications = function()
+{
+  if (canUseChromeNotifications)
+    initChromeNotifications();
+  initAntiAdblockNotification();
+};
+
+/**
+ * Shows the next notification for the supplied URL.
+ *
+ * @param {URL} url URL to match notifications to
+ */
+exports.showNextNotificationForUrl = function(url)
+{
+  NotificationStorage.showNext(stringifyURL(url));
+}
+
+/**
  * Gets the active notification to be shown if any.
  *
  * @return {?object}
  */
 exports.getActiveNotification = function()
 {
   return activeNotification;
 };
 
-setTimeout(showNextNotification, 3 * 60 * 1000);
+NotificationStorage.addShowListener(function(notification)
+{
+  showNotification(notification);
+});