Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

Convert SSL Observatory to use getBrowserForChannel. #796

Merged
cooperq merged 5 commits into from
Jan 16, 2015
Merged

Convert SSL Observatory to use getBrowserForChannel. #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
27b0f73
Convert SSL Observatory to use getBrowserForChannel.
jsha Dec 5, 2014
930ddb4
Merge branch 'master' into getbrowserforchannel
jsha Dec 17, 2014
68c662a
Merge branch 'master' of github.com:EFForg/https-everywhere into getb…
jsha Jan 8, 2015
78a8c44
Only dereference browser if it is defined.
jsha Jan 9, 2015
63fc0c3
Add semicolon.
jsha Jan 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions https-everywhere-tests/test_profile_skeleton/prefs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ user_pref("general.warnOnAboutConfig", false);
// Minimize unnecesary requests.
user_pref("browser.safebrowsing.enabled", false);
user_pref("browser.safebrowsing.malware.enabled", false);
// Enable browser debugging in test mode.
user_pref("devtools.debugger.remote-enabled", true);
// These two preferences allow debugging the extension
// using Tools > Web Developer > Browser Toolbox
// (Note: Since this is not an SDK extension, you can't use the Addon
// Debugger, but the Browser Toolbox is just about as good).
user_pref("devtools.chrome.enabled", true);
user_pref("devtools.debugger.remote-enabled", true);
8 changes: 7 additions & 1 deletion src/components/ssl-observatory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,13 @@ SSLObservatory.prototype = {
var HTTPSEverywhere = CC["@eff.org/https-everywhere;1"]
.getService(Components.interfaces.nsISupports)
.wrappedJSObject;
var win = channel ? HTTPSEverywhere.getWindowForChannel(channel) : null;
var win = null;
if (channel) {
var browser = this.HTTPSEverywhere.getBrowserForChannel(channel);
if (browser) {
var win = browser.contentWindow;
}
}
var req = this.buildRequest(params);
req.timeout = TIMEOUT;

Expand Down