Issue 3823 - Adapt message names used by "Block element" feature for consistency

background.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
@@ skipping 38 matching lines @@
 // See http://crbug.com/68705.
 var noStyleRulesHosts = ["mail.google.com", "mail.yahoo.com", "www.google.com"];
 
 var htmlPages = new ext.PageMap();
 
 var contextMenuItem = {
   title: ext.i18n.getMessage("block_element"),
   contexts: ["image", "video", "audio"],
   onclick: function(page)
   {
-    page.sendMessage({type: "blockelement-context-menu-clicked"});
+    page.sendMessage({type: "composer.content.contextMenuClicked"});
   }
 };
 
 // Adds or removes browser action icon according to options.
 function refreshIconAndContextMenu(page)
 {
   var whitelisted = !!checkWhitelisted(page);
   updateIcon(page, whitelisted);
 
   // show or hide the context menu entry dependent on whether
@@ skipping 47 matching lines @@
     }
   }
 
   return {filters: filters, exceptions: exceptions};
 }
 
 ext.onMessage.addListener(function (msg, sender, sendResponse)
 {
   switch (msg.type)
   {
-    case "blockelement-open-popup":
+    case "composer.openDialog":
       ext.windows.create({
         url: ext.getURL("block.html"),
         left: 50,
         top: 50,
         width: 420,
         height: 200,
         focused: true,
         type: "popup"
       },
       function (popupPage) {
         var popupPageId = popupPage.id;
         function onRemoved(removedPageId)
         {
           if (popupPageId == removedPageId)
           {
             sender.page.sendMessage({
-              type: "blockelement-popup-closed",
+              type: "composer.content.dialogClosed",
               popupId: popupPageId
             });
             ext.pages.onRemoved.removeListener(onRemoved);
           }
         }
         ext.pages.onRemoved.addListener(onRemoved);
 
         sendResponse(popupPageId);
       });
       return true;
@@ skipping 77 matching lines @@
       // The browser action popup asks us this.
       if(sender.page)
       {
         sendResponse({enabled: !checkWhitelisted(sender.page)});
         return;
       }
       break;
     case "add-sitekey":
       processKey(msg.token, sender.page, sender.frame);
       break;
-    case "report-html-page":
+    case "composer.ready":
       htmlPages.set(sender.page, null);
       refreshIconAndContextMenu(sender.page);
       break;
-    case "compose-filters":
+    case "composer.getFilters":
       sendResponse(composeFilters({
         tagName: msg.tagName,
         id: msg.id,
         src: msg.src,
         style: msg.style,
         classes: msg.classes,
         urls: msg.urls,
         type: msg.mediatype,
         baseURL: msg.baseURL,
         page: sender.page,
@@ skipping 27 matching lines @@
 
         targetPage.sendMessage(msg.payload);
       }
       break;
   }
 });
 
 // update icon when page changes location
 ext.pages.onLoading.addListener(function(page)
 {
-  page.sendMessage({type: "blockelement-finished"});
+  page.sendMessage({type: "composer.content.finished"});
   refreshIconAndContextMenu(page);
   showNextNotificationForUrl(page.url);
 });