Issue 2642 - Moved notifications code to separate module

background.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 29 matching lines @@
   this.isThirdParty = isThirdParty;
   this.extractHostFromFrame = extractHostFromFrame;
 }
 var FilterStorage = require("filterStorage").FilterStorage;
 var FilterNotifier = require("filterNotifier").FilterNotifier;
 var ElemHide = require("elemHide").ElemHide;
 var defaultMatcher = require("matcher").defaultMatcher;
 var Prefs = require("prefs").Prefs;
 var Synchronizer = require("synchronizer").Synchronizer;
 var Utils = require("utils").Utils;
-var initAntiAdblockNotification = require("antiadblockInit").initAntiAdblockNotification;
 var parseFilters = require("filterValidation").parseFilters;
 var composeFilters = require("filterComposer").composeFilters;
 var updateIcon = require("icon").updateIcon;
+var initNotifications = require("notificationHelper").initNotifications;
 
 var seenDataCorruption = false;
 var filterlistsReinitialized = false;
 
 function init()
 {
   var filtersLoaded = false;
   var prefsLoaded = false;
 
   var checkLoaded = function()
@@ skipping 16 matching lines @@
       seenDataCorruption = previousVersion && FilterStorage.firstRun;
       Prefs.currentVersion = info.addonVersion;
       addSubscription(previousVersion);
     }
 
     // The "Hide placeholders" option has been removed from the UI in 1.8.8.1285
     // So we reset the option for users updating from older versions.
     if (previousVersion && Services.vc.compare(previousVersion, "1.8.8.1285") < 0)
       Prefs.hidePlaceholders = true;
 
-    if (canUseChromeNotifications)
-      initChromeNotifications();
-    initAntiAdblockNotification();
+    initNotifications();
 
     // Update browser actions and context menus when whitelisting might have
     // changed. That is now when initally loading the filters and later when
     // importing backups or saving filter changes.
     FilterNotifier.addListener(function(action)
     {
       if (action == "load" || action == "save")
         refreshIconAndContextMenuForAllPages();
     });
     refreshIconAndContextMenuForAllPages();
@@ skipping 316 matching lines @@
       break;
   }
 });
 
 // update icon when page changes location
 ext.pages.onLoading.addListener(function(page)
 {
   page.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(page);
 });