Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2019-07-05 21:41:52 +08:00
commit b214a513f9
19 changed files with 30 additions and 16 deletions

View file

@ -263,7 +263,7 @@ var AddonsMgrListener = {
onDisabled: function(aAddon) this.onUninstalled(),
};
#ifdef MOZ_PERSONAS
var LightWeightThemeWebInstaller = {
handleEvent: function (event) {
switch (event.type) {
@ -534,3 +534,4 @@ var LightweightThemeListener = {
this.updateStyleSheet("url(" + themeData.headerURL + ")");
},
};
#endif

View file

@ -1216,9 +1216,11 @@ var gBrowserInit = {
placesContext.addEventListener("popuphiding", updateEditUIVisibility, false);
#endif
#ifdef MOZ_PERSONAS
gBrowser.mPanelContainer.addEventListener("InstallBrowserTheme", LightWeightThemeWebInstaller, false, true);
gBrowser.mPanelContainer.addEventListener("PreviewBrowserTheme", LightWeightThemeWebInstaller, false, true);
gBrowser.mPanelContainer.addEventListener("ResetBrowserThemePreview", LightWeightThemeWebInstaller, false, true);
#endif
// Bug 666808 - AeroPeek support for e10s
if (!gMultiProcessBrowser) {

View file

@ -53,8 +53,10 @@
titlemodifier_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"
#endif
titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
#ifdef MOZ_PERSONAS
lightweightthemes="true"
lightweightthemesfooter="browser-bottombox"
#endif
windowtype="navigator:browser"
macanimationtype="document"
screenX="4" screenY="4"