[Pkg-mozext-commits] [tabmixplus] 20/73: Move PrivateBrowsing functions to TabmixSessionManager

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository tabmixplus.

commit 74d1fbde53102acee9c936b4f7bf566267f5ccae
Author: onemen <tabmix.onemen at gmail.com>
Date:   Fri Apr 1 00:28:07 2016 +0300

    Move PrivateBrowsing functions to TabmixSessionManager
---
 chrome/content/links/setup.js     | 14 +-------------
 chrome/content/session/session.js | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/chrome/content/links/setup.js b/chrome/content/links/setup.js
index 59f7972..ad3ae56 100644
--- a/chrome/content/links/setup.js
+++ b/chrome/content/links/setup.js
@@ -61,19 +61,7 @@ Tabmix.beforeBrowserInitOnLoad = function() {
 
   try {
     var SM = TabmixSessionManager;
-    SM.globalPrivateBrowsing = PrivateBrowsingUtils.permanentPrivateBrowsing;
-    SM.isWindowPrivate = function(aWindow) {
-      return PrivateBrowsingUtils.isWindowPrivate(aWindow);
-    };
-    // isPrivateWindow is boolean property of this window, user can't change private status of a window
-    SM.isPrivateWindow = SM.isWindowPrivate(window);
-    SM.__defineGetter__("isPrivateSession", function() {
-      return this.globalPrivateBrowsing || TabmixSvc.sm.private;
-    });
-    // set this flag to false if user opens in a session at least one non-private window
-    SM.firstNonPrivateWindow = TabmixSvc.sm.private && !SM.isPrivateWindow;
-    if (SM.firstNonPrivateWindow)
-      TabmixSvc.sm.private = false;
+    SM.initializePrivateStateVars();
 
     var firstWindow = this.firstWindowInSession || SM.firstNonPrivateWindow;
     var disabled = TMP_SessionStore.isSessionStoreEnabled() ||
diff --git a/chrome/content/session/session.js b/chrome/content/session/session.js
index ffa1ccf..a3c23a9 100644
--- a/chrome/content/session/session.js
+++ b/chrome/content/session/session.js
@@ -247,10 +247,28 @@ TabmixSessionManager = {
   afterCrash: false,
   lastSessionWasEmpty: false,
 
-  // whether we are in private browsing mode
+  // private window functions
   globalPrivateBrowsing: false,
   firstNonPrivateWindow: false,
 
+  initializePrivateStateVars: function() {
+    this.globalPrivateBrowsing = PrivateBrowsingUtils.permanentPrivateBrowsing;
+    this.isPrivateWindow = this.isWindowPrivate(window);
+    this.firstNonPrivateWindow = TabmixSvc.sm.private && !this.isPrivateWindow;
+    if (this.firstNonPrivateWindow) {
+      // set this flag to false if user opens in a session at least one non-private window
+      TabmixSvc.sm.private = false;
+    }
+  },
+
+  get isPrivateSession() {
+    return this.globalPrivateBrowsing || TabmixSvc.sm.private;
+  },
+
+  isWindowPrivate: function(aWindow) {
+    return PrivateBrowsingUtils.isWindowPrivate(aWindow);
+  },
+
   get _statesToRestore() {
     return TabmixSvc.sm.statesToRestore;
   },

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git