Issue 5028 - Use browser namespace

desktop-options.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 525 matching lines @@
         return element.getAttribute("data-" + dataName);
       }
 
       element = element.parentElement;
     }
     return null;
   }
 
   function sendMessageHandleErrors(message, onSuccess)
   {
-    ext.backgroundPage.sendMessage(message, (errors) =>

[saroyanm, 2017/10/16 19:24:20]

Seems like this was replaced by chrome.runtime.sendMessage ->
https://hg.adblockplus.org/adblockplusui/rev/441e39c75d99#l1.13

I think this should be rebased.

[Manish Jethani, 2017/10/16 21:35:21]

Done.

+    browser.runtime.sendMessage(message, (errors) =>
     {
       if (errors.length > 0)
         alert(errors.join("\n"));
       else if (onSuccess)
         onSuccess();
     });
   }
 
   function switchTab(id)
   {
@@ skipping 21 matching lines @@
       case "cancel-custom-filters":
         setCustomFiltersView("read");
         break;
       case "change-language-subscription":
         for (let key in subscriptionsMap)
         {
           let subscription = subscriptionsMap[key];
           let subscriptionType = subscription.recommended;
           if (subscriptionType == "ads" && subscription.disabled == false)
           {
-            ext.backgroundPage.sendMessage({
+            browser.runtime.sendMessage({
               type: "subscriptions.remove",
               url: subscription.url
             });
-            ext.backgroundPage.sendMessage({
+            browser.runtime.sendMessage({
               type: "subscriptions.add",
               url: findParentData(element, "access", false)
             });
             break;
           }
         }
         break;
       case "close-dialog":
         closeDialog();
         break;
@@ skipping 17 matching lines @@
         if (listItem && !listItem.classList.contains("show-context-menu"))
           listItem.classList.add("show-context-menu");
         break;
       }
       case "open-dialog": {
         let dialog = findParentData(element, "dialog", false);
         openDialog(dialog);
         break;
       }
       case "remove-filter":
-        ext.backgroundPage.sendMessage({
+        browser.runtime.sendMessage({
           type: "filters.remove",
           text: findParentData(element, "access", false)
         });
         break;
       case "remove-subscription":
-        ext.backgroundPage.sendMessage({
+        browser.runtime.sendMessage({
           type: "subscriptions.remove",
           url: findParentData(element, "access", false)
         });
         break;
       case "save-custom-filters":
         sendMessageHandleErrors({
           type: "filters.importRaw",
           text: E("custom-filters-raw").value,
           removeExisting: true
         },
         () =>
         {
           setCustomFiltersView("read");
         });
         break;
       case "show-more-filters-section":
         E("more-filters").setAttribute("aria-hidden", false);
         break;
       case "switch-acceptable-ads":
         let value = element.value || element.dataset.value;
-        ext.backgroundPage.sendMessage({
+        browser.runtime.sendMessage({
           type: value == "privacy" ? "subscriptions.add" :
             "subscriptions.remove",
           url: acceptableAdsPrivacyUrl
         });
-        ext.backgroundPage.sendMessage({
+        browser.runtime.sendMessage({
           type: value == "ads" ? "subscriptions.add" : "subscriptions.remove",
           url: acceptableAdsUrl
         });
         break;
       case "switch-tab":
         switchTab(element.getAttribute("href").substr(1));
         break;
       case "toggle-disable-subscription":
-        ext.backgroundPage.sendMessage({
+        browser.runtime.sendMessage({
           type: "subscriptions.toggle",
           keepInstalled: true,
           url: findParentData(element, "access", false)
         });
         break;
       case "toggle-pref":
-        ext.backgroundPage.sendMessage({
+        browser.runtime.sendMessage({
           type: "prefs.toggle",
           key: findParentData(element, "pref", false)
         });
         break;
       case "toggle-remove-subscription":
         let subscriptionUrl = findParentData(element, "access", false);
         if (element.getAttribute("aria-checked") == "true")
         {
-          ext.backgroundPage.sendMessage({
+          browser.runtime.sendMessage({
             type: "subscriptions.remove",
             url: subscriptionUrl
           });
         }
         else
           addEnableSubscription(subscriptionUrl);
         break;
       case "update-all-subscriptions":
-        ext.backgroundPage.sendMessage({
+        browser.runtime.sendMessage({
           type: "subscriptions.update"
         });
         break;
       case "update-subscription":
-        ext.backgroundPage.sendMessage({
+        browser.runtime.sendMessage({
           type: "subscriptions.update",
           url: findParentData(element, "access", false)
         });
         break;
       case "validate-import-subscription":
         let form = findParentData(element, "validation", true);
         if (!form)
           return;
 
         if (form.checkValidity())
@@ skipping 141 matching lines @@
       if (!tabContent)
         break;
     }
   }
 
   function onDOMLoaded()
   {
     populateLists();
 
     // Initialize navigation sidebar
-    ext.backgroundPage.sendMessage({
+    browser.runtime.sendMessage({
       type: "app.get",
       what: "addonVersion"
     },
     (addonVersion) =>
     {
       E("abp-version").textContent = getMessage("options_dialog_about_version",
         [addonVersion]);
     });
 
     updateTooltips();
@@ skipping 28 matching lines @@
     {
       return checkbox.getAttribute("data-pref");
     });
     for (let key of customize)
     {
       getPref(key, (value) =>
       {
         onPrefMessage(key, value, true);
       });
     }
-    ext.backgroundPage.sendMessage({
+    browser.runtime.sendMessage({
       type: "app.get",
       what: "features"
     },
     (features) =>
     {
       hidePref("show_devtools_panel", !features.devToolsPanel);
     });
 
     getDocLink("filterdoc", (link) =>
     {
@@ skipping 135 matching lines @@
   function populateLists()
   {
     subscriptionsMap = Object.create(null);
     filtersMap = Object.create(null);
 
     // Empty collections and lists
     for (let property in collections)
       collections[property].clearAll();
 
     setCustomFiltersView("empty");
-    ext.backgroundPage.sendMessage({
+    browser.runtime.sendMessage({
       type: "subscriptions.get",
       special: true
     },
     (subscriptions) =>
     {
       // Load filters
       for (let subscription of subscriptions)
       {
-        ext.backgroundPage.sendMessage({
+        browser.runtime.sendMessage({
           type: "filters.get",
           subscriptionUrl: subscription.url
         },
         (filters) =>
         {
           loadCustomFilters(filters);
         });
       }
     });
     loadRecommendations();
-    ext.backgroundPage.sendMessage({
+    browser.runtime.sendMessage({
       type: "prefs.get",
       key: "subscriptions_exceptionsurl"
     },
     (url) =>
     {
       acceptableAdsUrl = url;
 
-      ext.backgroundPage.sendMessage({
+      browser.runtime.sendMessage({
         type: "prefs.get",
         key: "subscriptions_exceptionsurl_privacy"
       },
       (urlPrivacy) =>
       {
         acceptableAdsPrivacyUrl = urlPrivacy;
 
         // Load user subscriptions
-        ext.backgroundPage.sendMessage({
+        browser.runtime.sendMessage({
           type: "subscriptions.get",
           downloadable: true
         },
         (subscriptions) =>
         {
           for (let subscription of subscriptions)
             onSubscriptionMessage("added", subscription);
 
           setAcceptableAds();
         });
@@ skipping 37 matching lines @@
 
     let message = {
       type: messageType,
       url
     };
     if (title)
       message.title = title;
     if (homepage)
       message.homepage = homepage;
 
-    ext.backgroundPage.sendMessage(message);
+    browser.runtime.sendMessage(message);
   }
 
   function onFilterMessage(action, filter)
   {
     switch (action)
     {
       case "added":
         filter[timestampUI] = Date.now();
         updateFilter(filter);
         break;
@@ skipping 90 matching lines @@
   {
     let checkPref = getPref.checks[key] || getPref.checkNone;
     checkPref((isActive) =>
     {
       if (!isActive)
       {
         hidePref(key, !isActive);
         return;
       }
 
-      ext.backgroundPage.sendMessage({
+      browser.runtime.sendMessage({
         type: "prefs.get",
         key
       }, callback);
     });
   }
 
   getPref.checkNone = function(callback)
   {
     callback(true);
   };
@@ skipping 73 matching lines @@
         break;
       case "prefs.respond":
         onPrefMessage(message.action, message.args[0], false);
         break;
       case "subscriptions.respond":
         onSubscriptionMessage(message.action, message.args[0]);
         break;
     }
   });
 
-  ext.backgroundPage.sendMessage({
+  browser.runtime.sendMessage({
     type: "app.listen",
     filter: ["addSubscription", "focusSection"]
   });
-  ext.backgroundPage.sendMessage({
+  browser.runtime.sendMessage({
     type: "filters.listen",
     filter: ["added", "loaded", "removed"]
   });
-  ext.backgroundPage.sendMessage({
+  browser.runtime.sendMessage({
     type: "prefs.listen",
     filter: ["notifications_ignoredcategories", "notifications_showui",
              "show_devtools_panel", "shouldShowBlockElementMenu"]
   });
-  ext.backgroundPage.sendMessage({
+  browser.runtime.sendMessage({
     type: "subscriptions.listen",
     filter: ["added", "disabled", "homepage", "lastDownload", "removed",
              "title", "downloadStatus", "downloading"]
   });
 
   window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
   window.addEventListener("hashchange", onHashChange, false);
 }