Merge pull request #138 from zklinger/private-browsing

Fix command history and search history in 'per-window private mode'

Author: maxauthority

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/commandline.js

@@ -19,29 +19,42 @@ const CommandLine = Module("commandline", {
 
         this._callbacks = {};
 
-        storage.newArray("history-search", { store: true, privateData: true });
-        storage.newArray("history-command", { store: true, privateData: true });
+        ["search", "command"].forEach(function (mode) {
+            let isPrivate = liberator.isPrivateWindow();
+            storage.newArray(liberator.storeName(mode, isPrivate), { store: !isPrivate});
+        }, this);
 
         // Really inideal.
         let services = modules.services; // Storage objects are global to all windows, 'modules' isn't.
         storage.newObject("sanitize", function () {
             ({
                 CLEAR: "browser:purge-session-history",
                 QUIT:  "quit-application",
+                PRIVATE_END: "last-pb-context-exited",
+
                 init: function () {
                     services.get("obs").addObserver(this, this.CLEAR, false);
                     services.get("obs").addObserver(this, this.QUIT, false);
+                    services.get("obs").addObserver(this, this.PRIVATE_END, false);
                 },
                 observe: function (subject, topic, data) {
                     switch (topic) {
                     case this.CLEAR:
                         ["search", "command"].forEach(function (mode) {
-                            CommandLine.History(null, mode).sanitize();
-                        });
+                            CommandLine.History(null, mode, liberator.isPrivateWindow()).sanitize();
+                        }, this);
+                        break;
+                    case this.PRIVATE_END:
+                        for (let [key, obj] in Iterator(storage)) {
+                            if (key.match(/^private-[0-9]/)) {
+                                    delete storage[key];
+                                }
+                        }
                         break;
                     case this.QUIT:
                         services.get("obs").removeObserver(this, this.CLEAR);
                         services.get("obs").removeObserver(this, this.QUIT);
+                        services.get("obs").removeObserver(this, this.PRIVATE_END);
                         break;
                     }
                 }
@@ -471,7 +484,9 @@ const CommandLine = Module("commandline", {
 
         this.show();
 
-        this._history = CommandLine.History(this._commandWidget.inputField, (modes.extended == modes.EX) ? "command" : "search");
+        this._history = CommandLine.History(this._commandWidget.inputField,
+                (modes.extended == modes.EX) ? "command" : "search",
+                liberator.isPrivateWindow());
         this._completions = CommandLine.Completions(this._commandWidget.inputField);
 
         // open the completion list automatically if wanted
@@ -662,7 +677,9 @@ const CommandLine = Module("commandline", {
         this.show();
         this._commandWidget.focus();
 
-        this._history = CommandLine.History(this._commandWidget.inputField, (modes.extended == modes.EX) ? "command" : "search");
+        this._history = CommandLine.History(this._commandWidget.inputField,
+                (modes.extended == modes.EX) ? "command" : "search",
+                liberator.isPrivateWindow());
         this._completions = CommandLine.Completions(this._commandWidget.inputField);
     },
 
@@ -1032,10 +1049,11 @@ const CommandLine = Module("commandline", {
      * @param {string} mode The mode for which we need history.
      */
     History: Class("History", {
-        init: function (inputField, mode) {
+        init: function (inputField, mode, privateBrowsing) {
             this.mode = mode;
             this.input = inputField;
-            this.store = storage["history-" + mode];
+            this.storeName = liberator.storeName(mode, privateBrowsing);
+            this.store = storage[this.storeName];
             this.reset();
         },
         /**

common/content/events.js

@@ -24,7 +24,7 @@ const Events = Module("events", {
 
         this.sessionListeners = [];
 
-        this._macros = storage.newMap("macros", { store: true, privateData: true });
+        this._macros = storage.newMap("macros", { store: true });
 
         // NOTE: the order of ["Esc", "Escape"] or ["Escape", "Esc"]
         //       matters, so use that string as the first item, that you

common/content/liberator.js

@@ -254,6 +254,25 @@ const Liberator = Module("liberator", {
         window.dump(msg.replace(/^./gm, ("config" in modules && config.name.toLowerCase()) + ": $&"));
     },
 
+    isPrivateWindow: function () {
+        return window.QueryInterface(Ci.nsIInterfaceRequestor)
+                     .getInterface(Ci.nsIWebNavigation)
+                     .QueryInterface(Ci.nsILoadContext)
+                     .usePrivateBrowsing;
+    },
+
+    windowID: function() {
+        return window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                     .getInterface(Components.interfaces.nsIDOMWindowUtils)
+                     .outerWindowID;
+
+    },
+
+    storeName: function(mode, isPrivate) {
+        let prefix = isPrivate ? "private-" + this.windowID() + "-" : "";
+        return prefix + "history-" + mode ;
+    },
+
     /**
      * Outputs a plain message to the command line.
      *
@@ -1171,10 +1190,7 @@ const Liberator = Module("liberator", {
                         win.setAttribute("titlemodifier_normal", value);
                         win.setAttribute("titlemodifier_privatebrowsing", value + suffix);
 
-                        if (window.QueryInterface(Ci.nsIInterfaceRequestor)
-                                  .getInterface(Ci.nsIWebNavigation)
-                                  .QueryInterface(Ci.nsILoadContext)
-                                  .usePrivateBrowsing) {
+                        if (liberator.isPrivateWindow()) {
                             win.setAttribute("titlemodifier", value + suffix);
                         }
                         else

common/content/marks.js

@@ -11,8 +11,8 @@ const Marks = Module("marks", {
     requires: ["config", "storage"],
 
     init: function init() {
-        this._localMarks = storage.newMap("local-marks", { store: true, privateData: true });
-        this._urlMarks = storage.newMap("url-marks", { store: false, privateData: true });
+        this._localMarks = storage.newMap("local-marks", { store: true });
+        this._urlMarks = storage.newMap("url-marks", { store: false });
 
         this._pendingJumps = [];
     },

common/content/quickmarks.js

@@ -12,7 +12,7 @@ const QuickMarks = Module("quickmarks", {
     requires: ["config", "storage"],
 
     init: function () {
-        this._qmarks = storage.newMap("quickmarks", { store: true, privateData: true });
+        this._qmarks = storage.newMap("quickmarks", { store: true });
     },
 
     /**

common/content/sanitizer.js

@@ -74,7 +74,7 @@ const Sanitizer = Module("sanitizer", {
         commands.add(["sa[nitize]"],
             "Clear private data",
             function (args) {
-                liberator.assert(!options['private'], "Cannot sanitize items in private mode");
+                liberator.assert(!liberator.isPrivateWindow(), "Cannot sanitize items in private mode");
 
                 let timespan = args["-timespan"] == undefined ? options["sanitizetimespan"] : args["-timespan"];
 

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,8 +151,6 @@ function loadPref(name, store, type) {
 }
 
 function savePref(obj) {
-    if (obj.privateData && storage.privateMode)
-        return;
     if (obj.store && storage.infoPath)
         writeFile(getFile(obj.name), obj.serial);
 }
@@ -357,14 +355,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: