Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 794228 - addon-manager services are running in B2G [r=glandium]

Browse Source
This commit is contained in:
Fabrice Desré 2012-10-15 11:14:53 -07:00
parent 879e234b2e
commit cfc35322a6
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
b2g/installer/package-manifest.in
View File

@ -2,7 +2,7 @@
; License, v. 2.0. If a copy of the MPL was not distributed with this
; file, You can obtain one at http://mozilla.org/MPL/2.0/.
; Package file for the B2G build.
; Package file for the B2G build.
;
; File format:
;
@ -380,11 +380,13 @@
@BINPATH@/components/GPSDGeolocationProvider.js
@BINPATH@/components/nsSidebar.manifest
@BINPATH@/components/nsSidebar.js
#ifndef MOZ_WIDGET_GONK
@BINPATH@/components/extensions.manifest
@BINPATH@/components/addonManager.js
@BINPATH@/components/amContentHandler.js
@BINPATH@/components/amWebInstallListener.js
@BINPATH@/components/nsBlocklistService.js
#endif
#ifdef MOZ_UPDATER
@BINPATH@/components/nsUpdateService.manifest

5
toolkit/components/telemetry/Makefile.in
View File

@ -33,9 +33,12 @@ XPIDLSRCS = \
nsITelemetry.idl \
$(NULL)
EXTRA_PP_COMPONENTS = \
TelemetryPing.js \
$(NULL)
EXTRA_COMPONENTS = \
TelemetryPing.manifest \
TelemetryPing.js \
$(NULL)
EXTRA_JS_MODULES = \

6
toolkit/components/telemetry/TelemetryPing.js
View File

@ -11,8 +11,10 @@ const Cu = Components.utils;
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/NetUtil.jsm");
#ifndef MOZ_WIDGET_GONK
Cu.import("resource://gre/modules/LightweightThemeManager.jsm");
Cu.import("resource://gre/modules/ctypes.jsm");
#endif
Cu.import("resource://gre/modules/ctypes.jsm");
// When modifying the payload in incompatible ways, please bump this version number
const PAYLOAD_VERSION = 1;
@ -379,9 +381,11 @@ TelemetryPing.prototype = {
}
}
#ifndef MOZ_WIDGET_GONK
let theme = LightweightThemeManager.currentTheme;
if (theme)
ret.persona = theme.id;
#endif
if (this._addons)
ret.addons = this._addons;

2
toolkit/mozapps/extensions/Makefile.in
View File

@ -35,10 +35,10 @@ XPIDLSRCS = \
EXTRA_PP_COMPONENTS = \
nsBlocklistService.js \
extensions.manifest \
$(NULL)
EXTRA_COMPONENTS = \
extensions.manifest \
addonManager.js \
amContentHandler.js \
amWebInstallListener.js \

2
toolkit/mozapps/extensions/extensions.manifest
View File

@ -1,5 +1,6 @@
component {66354bc9-7ed1-4692-ae1d-8da97d6b205e} nsBlocklistService.js
contract @mozilla.org/extensions/blocklist;1 {66354bc9-7ed1-4692-ae1d-8da97d6b205e}
#ifndef MOZ_WIDGET_GONK
category update-timer nsBlocklistService @mozilla.org/extensions/blocklist;1,getService,blocklist-background-update-timer,extensions.blocklist.interval,86400
component {4399533d-08d1-458c-a87a-235f74451cfa} addonManager.js
contract @mozilla.org/addons/integration;1 {4399533d-08d1-458c-a87a-235f74451cfa}
@ -9,3 +10,4 @@ contract @mozilla.org/uriloader/content-handler;1?type=application/x-xpinstall {
component {0f38e086-89a3-40a5-8ffc-9b694de1d04a} amWebInstallListener.js
contract @mozilla.org/addons/web-install-listener;1 {0f38e086-89a3-40a5-8ffc-9b694de1d04a}
category addon-provider-module PluginProvider resource://gre/modules/PluginProvider.jsm
#endif