summaryrefslogtreecommitdiffstats
path: root/browser/components
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-22 08:59:14 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-22 08:59:14 +0100
commiteaac0616072e22313ea96eb6e68d9a8f28f70dc7 (patch)
treec967d49511cb2696bdca86affac1e6ee7b374a3b /browser/components
parentd77729916b4b9c2b67abd41181336c2cbb1da968 (diff)
parent6f96569b4499be07c210ca6c38739bbbc7ebdee7 (diff)
downloadUXP-eaac0616072e22313ea96eb6e68d9a8f28f70dc7.tar
UXP-eaac0616072e22313ea96eb6e68d9a8f28f70dc7.tar.gz
UXP-eaac0616072e22313ea96eb6e68d9a8f28f70dc7.tar.lz
UXP-eaac0616072e22313ea96eb6e68d9a8f28f70dc7.tar.xz
UXP-eaac0616072e22313ea96eb6e68d9a8f28f70dc7.zip
Merge branch 'ported-moebius'
Diffstat (limited to 'browser/components')
-rw-r--r--browser/components/nsBrowserGlue.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index d69a11f6b..f97c173a0 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -64,6 +64,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "AlertsService", "@mozilla.org/alerts-s
["Task", "resource://gre/modules/Task.jsm"],
["UITour", "resource:///modules/UITour.jsm"],
["URLBarZoom", "resource:///modules/URLBarZoom.jsm"],
+ ["UserAgentOverrides", "resource://gre/modules/UserAgentOverrides.jsm"],
["WebChannel", "resource://gre/modules/WebChannel.jsm"],
["WindowsRegistry", "resource://gre/modules/WindowsRegistry.jsm"],
["webrtcUI", "resource:///modules/webrtcUI.jsm"],
@@ -662,6 +663,8 @@ BrowserGlue.prototype = {
}
} catch (ex) { /* missing any of the prefs is not critical */ }
+ UserAgentOverrides.init();
+
PageThumbs.init();
webrtcUI.init();
AboutHome.init();
@@ -1042,6 +1045,7 @@ BrowserGlue.prototype = {
BrowserUsageTelemetry.uninit();
SelfSupportBackend.uninit();
+ UserAgentOverrides.uninit();
PageThumbs.uninit();
NewTabMessages.uninit();
AboutNewTab.uninit();