Remove pre FF20 private browsing compatibility code

Since Firefox ESR's version is well above version 20 and the minimum Firefox
version for Vimperator is 27, it's time to remove old per-browser based
private browsing related compatibility code.

Author: zklinger

common/content/browser.js

@@ -52,47 +52,6 @@ const Browser = Module("browser", {
                 completer: function (context) completion.charset(context)
             });
 
-        // only available in FF 3.5-19
-        // TODO: remove when FF ESR's version is over 20. privateBrowsing will be per-window from FF 20+
-        // XXX: on Fx20, nsIPrivateBrowsingService exists yet but has no properties
-        let pb = services.get("privateBrowsing");
-        if (pb && "privateBrowsingEnabled" in pb) {
-            options.add(["private", "pornmode"],
-                "Set the 'private browsing' option",
-                "boolean", false,
-                {
-                    setter: function (value) services.get("privateBrowsing").privateBrowsingEnabled = value,
-                    getter: function () services.get("privateBrowsing").privateBrowsingEnabled
-                });
-            let services = modules.services; // Storage objects are global to all windows, 'modules' isn't.
-            storage.newObject("private-mode", function () {
-                ({
-                    init: function () {
-                        services.get("obs").addObserver(this, "private-browsing", false);
-                        services.get("obs").addObserver(this, "quit-application", false);
-                        this.private = services.get("privateBrowsing").privateBrowsingEnabled;
-                    },
-                    observe: function (subject, topic, data) {
-                        if (topic == "private-browsing") {
-                            if (data == "enter")
-                                storage.privateMode = true;
-                            else if (data == "exit")
-                                storage.privateMode = false;
-                            storage.fireEvent("private-mode", "change", storage.privateMode);
-                        }
-                        else if (topic == "quit-application") {
-                            services.get("obs").removeObserver(this, "quit-application");
-                            services.get("obs").removeObserver(this, "private-browsing");
-                        }
-                    }
-                }).init();
-            }, { store: false });
-            storage.addObserver("private-mode",
-                function (key, event, value) {
-                    autocommands.trigger("PrivateMode", { state: value });
-                }, window);
-        }
-
         options.add(["urlseparator"],
             "Set the separator regex used to separate multiple URL args",
             "string", ",\\s");

common/content/services.js

@@ -42,10 +42,6 @@ const Services = Module("services", {
                 class_: "@mozilla.org/browser/nav-history-service;1",
                 iface:  [Ci.nsINavHistoryService, Ci.nsIBrowserHistory]
             },
-            "privateBrowsing": {
-                class_: "@mozilla.org/privatebrowsing;1",
-                iface:  Ci.nsIPrivateBrowsingService
-            },
             "profile": {
                 class_: "@mozilla.org/toolkit/profile-service;1",
                 iface:  Ci.nsIToolkitProfileService

common/locale/en-US/options.xml

@@ -640,23 +640,6 @@
 </item>
 
 
-<item>
-    <tags>'noprivate' 'private'</tags>
-    <spec>'private'</spec>
-    <type>boolean</type>
-    <default>off</default>
-    <description>
-        <p>
-            Set the <str>private browsing</str> option. In private browsing mode
-            history, cache files, cookies, form data, passwords, download list
-            entries, local and URL marks, command-line history and macros are
-            available only for the duration of the private browsing session and
-            deleted when returning to normal browsing mode.
-        </p>
-    </description>
-</item>
-
-
 <item>
     <tags>'nohls' 'nohlsearch'</tags>
     <tags>'hls' 'hlsearch'</tags>

common/modules/storage.jsm

@@ -151,7 +151,7 @@ function loadPref(name, store, type) {
 }
 
 function savePref(obj) {
-    if (obj.privateData && storage.privateMode)
+    if (obj.privateData)
         return;
     if (obj.store && storage.infoPath)
         writeFile(getFile(obj.name), obj.serial);
@@ -357,14 +357,6 @@ var storage = {
             savePref(obj);
     },
 
-    _privateMode: false,
-    get privateMode() this._privateMode,
-    set privateMode(val) {
-        if (!val && this._privateMode)
-            for (let key in keys)
-                this.load(key);
-        return this._privateMode = Boolean(val);
-    }
 };
 
 // vim: set fdm=marker sw=4 sts=4 et ft=javascript: