Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 07:45:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1524688: Part 15 - Convert Weave to static registration. r=markh

Browse Source 
--HG--
rename : services/sync/Weave.js => services/sync/Weave.jsm
extra : rebase_source : 5f0645c23e571b5a7fad2393ec135a443e56764c
This commit is contained in:
Kris Maglione 2019-01-29 20:44:18 -08:00
parent 8d2d3540c6
commit bb9f19264a
5 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/installer/package-manifest.in
View File

@ -238,7 +238,6 @@
@RESPATH@/browser/components/MacTouchBar.js
#endif
@RESPATH@/components/SyncComponents.manifest
@RESPATH@/components/Weave.js
@RESPATH@/components/FxAccountsComponents.manifest
@RESPATH@/components/FxAccountsPush.js
@RESPATH@/components/CaptivePortalDetectComponents.manifest

6
services/sync/SyncComponents.manifest
View File

@ -1,9 +1,3 @@
# Weave.js
component {74b89fb0-f200-4ae8-a3ec-dd164117f6de} Weave.js
contract @mozilla.org/weave/service;1 {74b89fb0-f200-4ae8-a3ec-dd164117f6de}
component {d28f8a0b-95da-48f4-b712-caf37097be41} Weave.js
contract @mozilla.org/network/protocol/about;1?what=sync-log {d28f8a0b-95da-48f4-b712-caf37097be41}
# Register resource aliases
# (Note, for tests these are also set up in addResourceAlias)
resource services-sync resource://gre/modules/services-sync/

6
services/sync/Weave.js → services/sync/Weave.jsm
View File

@ -6,9 +6,6 @@ const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm")
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "FileUtils",
"resource://gre/modules/FileUtils.jsm");
XPCOMUtils.defineLazyGetter(this, "Utils", () => {
return ChromeUtils.import("resource://services-sync/util.js", {}).Utils;
});
XPCOMUtils.defineLazyPreferenceGetter(this, "syncUsername", "services.sync.username");
@ -157,5 +154,4 @@ AboutWeaveLog.prototype = {
},
};
const components = [WeaveService, AboutWeaveLog];
this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
var EXPORTED_SYMBOLS = ["WeaveService", "AboutWeaveLog"];

20
services/sync/components.conf Normal file
View File

@ -0,0 +1,20 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
Classes = [
{
'cid': '{74b89fb0-f200-4ae8-a3ec-dd164117f6de}',
'contract_ids': ['@mozilla.org/weave/service;1'],
'jsm': 'resource://services-sync/Weave.jsm',
'constructor': 'WeaveService',
},
{
'cid': '{d28f8a0b-95da-48f4-b712-caf37097be41}',
'contract_ids': ['@mozilla.org/network/protocol/about;1?what=sync-log'],
'jsm': 'resource://services-sync/Weave.jsm',
'constructor': 'AboutWeaveLog',
},
]

6
services/sync/moz.build
View File

@ -13,7 +13,6 @@ XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
EXTRA_COMPONENTS += [
'SyncComponents.manifest',
'Weave.js',
]
EXTRA_JS_MODULES['services-sync'] += [
@ -39,6 +38,7 @@ EXTRA_JS_MODULES['services-sync'] += [
'modules/telemetry.js',
'modules/UIState.jsm',
'modules/util.js',
'Weave.jsm',
]
EXTRA_JS_MODULES['services-sync'].engines += [
@ -58,6 +58,10 @@ EXTRA_JS_MODULES['services-sync'].stages += [
'modules/stages/enginesync.js',
]
XPCOM_MANIFESTS += [
'components.conf',
]
TESTING_JS_MODULES.services.sync += [
'modules-testing/fakeservices.js',
'modules-testing/fxa_utils.js',