Remove "disable inline text-ads" feature

background.js

 /*
  * This file is part of the Adblock Plus extension,
  * Copyright (C) 2006-2012 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 43 matching lines @@
       localStorage["currentVersion"] = addonVersion;
       addSubscription(prevVersion);
     }
   }
 });
 
 // Special-case domains for which we cannot use style-based hiding rules.
 // See http://crbug.com/68705.
 var noStyleRulesHosts = ["mail.google.com", "mail.yahoo.com", "www.google.com"];
 
+function removeDeprecatedOptions()
+{
+  var deprecatedOptions = ["specialCaseYouTube", "experimental", "disableInlineTextAds"];
+  deprecatedOptions.forEach(function(option)
+  {
+    if (option in localStorage)
+      delete localStorage[option];
+  });
+}
+
 // Sets options to defaults, upgrading old options from previous versions as necessary
 function setDefaultOptions()
 {
   function defaultOptionValue(opt, val)
   {
     if(!(opt in localStorage))
       localStorage[opt] = val;
   }
 
   defaultOptionValue("shouldShowIcon", "true");
   defaultOptionValue("shouldShowBlockElementMenu", "true");
 
-  // If user had older version installed, get rid of old option
-  if ("specialCaseYouTube" in localStorage)
-    delete localStorage.specialCaseYouTube;
-  if ("experimental" in localStorage)
-    delete localStorage.experimental;

[Wladimir Palant, 2012/11/06 08:06:11]

Please add disableInlineTextAds here to remove the option from localStorage if
it exists.

[Felix Dahlke, 2012/11/06 08:16:38]

Done. I've refactored this a bit.

+  removeDeprecatedOptions();
 }
 
 // Upgrade options before we do anything else.
 setDefaultOptions();
 
 /**
  * Checks whether a page is whitelisted.
  * @param {String} url
  * @param {String} [type] content type to be checked, default is "DOCUMENT"
  * @return {Filter} filter that matched the URL or null if not whitelisted
@@ skipping 463 matching lines @@
         sendResponse(collapse);
       }
       else
         sendResponse(false);
       break;
     case "get-domain-enabled-state":
       // Returns whether this domain is in the exclusion list.
       // The page action popup asks us this.
       if(sender.tab)
       {
-        sendResponse({enabled: !isWhitelisted(sender.tab.url), specialCaseYouTube: localStorage["specialCaseYouTube"] == "true"});

[Wladimir Palant, 2012/11/06 08:06:11]

Please get rid of specialCaseYouTube as well here while you are at it - this is
a left-over from another removed feature.

[Felix Dahlke, 2012/11/06 08:16:38]

Done.

+        sendResponse({enabled: !isWhitelisted(sender.tab.url)});
         return;
       }
       break;
     case "add-filters":
       if (request.filters && request.filters.length)
       {
         for (var i = 0; i < request.filters.length; i++)
           FilterStorage.addFilter(Filter.fromText(request.filters[i]));
       }
       break;
@@ skipping 20 matching lines @@
       refreshIconAndContextMenu(windows[i].tabs[j]);
 });
 
 // Update icon if a tab changes location
 chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab)
 {
   chrome.tabs.sendRequest(tabId, {reqtype: "clickhide-deactivate"})
   if(changeInfo.status == "loading")
     refreshIconAndContextMenu(tab);
 });