Issue 3499 - Use the new messaging API for object tabs

lib/objectTabs.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  * @fileOverview Code responsible for showing and hiding object tabs.
  */
 
 let {Prefs} = require("prefs");
 let {Utils} = require("utils");
+let {port} = require("messaging");
 
 /**
  * Random element class, to be used for object tabs displayed on top of the
  * plugin content.
  * @type string
  */
 let classVisibleTop = null;
 
 /**
  * Random element class, to be used for object tabs displayed at the bottom of
  * the plugin content.
  * @type string
  */
 let classVisibleBottom = null;
 
 /**
  * Random element class, to be used for object tabs that are hidden.
  * @type string
  */
 let classHidden = null;
 
-Utils.addChildMessageListener("AdblockPlus:GetObjectTabsStatus", function()
+port.on("getObjectTabsStatus", function(message, sender)
 {
   let {UI} = require("ui");
 
   return !!(Prefs.enabled && Prefs.frameobjects && UI.overlay && classHidden);
 });
 
-Utils.addChildMessageListener("AdblockPlus:GetObjectTabsTexts", function()
+port.on("getObjectTabsTexts", function(message, sender)
 {
   let {UI} = require("ui");
 
   return {
     label: UI.overlay.attributes.objtabtext,
     tooltip: UI.overlay.attributes.objtabtooltip,
     classVisibleTop, classVisibleBottom, classHidden
   };
 });
 
-Utils.addChildMessageListener("AdblockPlus:BlockItem", function({request, nodesID})
+port.on("blockItem", function({request, nodesID}, sender)
 {
   let {UI} = require("ui");
   UI.blockItem(UI.currentWindow, nodesID, request);
 });
 
 function init()
 {
   function processCSSData(event)
   {
     if (onShutdown.done)
@@ skipping 29 matching lines @@
     request.overrideMimeType("text/plain");
     request.addEventListener("load", processCSSData, false);
     request.send(null);
   }
   catch (e)
   {
     Cu.reportError(e);
   }
 }
 init();