summaryrefslogtreecommitdiffstats
path: root/browser/base/content/browser.js
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-05-25 22:00:26 +0200
committerGitHub <noreply@github.com>2018-05-25 22:00:26 +0200
commitd5459982f0d1bab08b751dc140c4cbe047032617 (patch)
tree0dfe07f8e1b8d121d12de8d16df524db344c6826 /browser/base/content/browser.js
parentedccc615f9435d658febac9be2299542349e2b08 (diff)
parentf786134c442da55a2a45e1422ef8530c892899b6 (diff)
downloadUXP-d5459982f0d1bab08b751dc140c4cbe047032617.tar
UXP-d5459982f0d1bab08b751dc140c4cbe047032617.tar.gz
UXP-d5459982f0d1bab08b751dc140c4cbe047032617.tar.lz
UXP-d5459982f0d1bab08b751dc140c4cbe047032617.tar.xz
UXP-d5459982f0d1bab08b751dc140c4cbe047032617.zip
Merge pull request #381 from Ascrod/master
Remove the Social API
Diffstat (limited to 'browser/base/content/browser.js')
-rwxr-xr-xbrowser/base/content/browser.js10
1 files changed, 1 insertions, 9 deletions
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 8679bca83..4b8ec864b 100755
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -44,7 +44,6 @@ Cu.import("resource://gre/modules/NotificationDB.jsm");
["ShortcutUtils", "resource://gre/modules/ShortcutUtils.jsm"],
["SimpleServiceDiscovery", "resource://gre/modules/SimpleServiceDiscovery.jsm"],
["SitePermissions", "resource:///modules/SitePermissions.jsm"],
- ["Social", "resource:///modules/Social.jsm"],
["TabCrashHandler", "resource:///modules/ContentCrashHandlers.jsm"],
["Task", "resource://gre/modules/Task.jsm"],
["TelemetryStopwatch", "resource://gre/modules/TelemetryStopwatch.jsm"],
@@ -1405,8 +1404,6 @@ var gBrowserInit = {
// Enable the Restore Last Session command if needed
RestoreLastSessionObserver.init();
- SocialUI.init();
-
// Start monitoring slow add-ons
AddonWatcher.init();
@@ -1537,7 +1534,6 @@ var gBrowserInit = {
gPrefService.removeObserver(ctrlTab.prefName, ctrlTab);
ctrlTab.uninit();
- SocialUI.uninit();
gBrowserThumbnails.uninit();
FullZoom.destroy();
@@ -4297,9 +4293,7 @@ var XULBrowserWindow = {
// Called before links are navigated to to allow us to retarget them if needed.
onBeforeLinkTraversal: function(originalTarget, linkURI, linkNode, isAppTab) {
- let target = BrowserUtils.onBeforeLinkTraversal(originalTarget, linkURI, linkNode, isAppTab);
- SocialUI.closeSocialPanelForLinkTraversal(target, linkNode);
- return target;
+ return BrowserUtils.onBeforeLinkTraversal(originalTarget, linkURI, linkNode, isAppTab);
},
// Check whether this URI should load in the current process
@@ -4480,8 +4474,6 @@ var XULBrowserWindow = {
gIdentityHandler.onLocationChange();
- SocialUI.updateState();
-
UITour.onLocationChange(location);
gTabletModePageCounter.inc();