mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-20 00:35:44 +00:00
Bug 1524688: Part 38 - Convert ContentPrefService2 to static registration. r=mconley
Differential Revision: https://phabricator.services.mozilla.com/D18448 --HG-- rename : toolkit/components/contentprefs/ContentPrefService2.js => toolkit/components/contentprefs/ContentPrefService2.jsm extra : source : 56c61e0a1f45442c854424598801d5616009621c
This commit is contained in:
parent
5186d27961
commit
cff53ab02c
@ -205,8 +205,6 @@
|
||||
@RESPATH@/components/nsUpdateService.manifest
|
||||
#endif
|
||||
@RESPATH@/components/ProcessSingleton.manifest
|
||||
@RESPATH@/components/ContentPrefService2.manifest
|
||||
@RESPATH@/components/ContentPrefService2.js
|
||||
@RESPATH@/components/nsContentDispatchChooser.manifest
|
||||
@RESPATH@/components/nsContentDispatchChooser.js
|
||||
@RESPATH@/components/contentAreaDropListener.manifest
|
||||
|
@ -144,8 +144,6 @@
|
||||
@BINPATH@/components/ClearDataService.js
|
||||
|
||||
@BINPATH@/components/ProcessSingleton.manifest
|
||||
@BINPATH@/components/ContentPrefService2.manifest
|
||||
@BINPATH@/components/ContentPrefService2.js
|
||||
@BINPATH@/components/HandlerService.manifest
|
||||
@BINPATH@/components/HandlerService.js
|
||||
@BINPATH@/components/contentAreaDropListener.manifest
|
||||
|
@ -2,7 +2,6 @@
|
||||
* 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/. */
|
||||
|
||||
const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
||||
const {ContentPref, cbHandleCompletion, cbHandleError, cbHandleResult} = ChromeUtils.import("resource://gre/modules/ContentPrefUtils.jsm");
|
||||
const {ContentPrefStore} = ChromeUtils.import("resource://gre/modules/ContentPrefStore.jsm");
|
||||
@ -1243,5 +1242,4 @@ function invalidArg(msg) {
|
||||
|
||||
// XPCOM Plumbing
|
||||
|
||||
var components = [ContentPrefService2];
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
|
||||
var EXPORTED_SYMBOLS = ["ContentPrefService2"];
|
@ -1,3 +0,0 @@
|
||||
component {e3f772f3-023f-4b32-b074-36cf0fd5d414} ContentPrefService2.js
|
||||
contract @mozilla.org/content-pref/service;1 {e3f772f3-023f-4b32-b074-36cf0fd5d414}
|
||||
|
14
toolkit/components/contentprefs/components.conf
Normal file
14
toolkit/components/contentprefs/components.conf
Normal file
@ -0,0 +1,14 @@
|
||||
# -*- 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': '{e3f772f3-023f-4b32-b074-36cf0fd5d414}',
|
||||
'contract_ids': ['@mozilla.org/content-pref/service;1'],
|
||||
'jsm': 'resource://gre/modules/ContentPrefService2.jsm',
|
||||
'constructor': 'ContentPrefService2',
|
||||
},
|
||||
]
|
@ -12,17 +12,17 @@ MOCHITEST_MANIFESTS += [
|
||||
'tests/mochitest/mochitest.ini'
|
||||
]
|
||||
|
||||
EXTRA_COMPONENTS += [
|
||||
'ContentPrefService2.js',
|
||||
'ContentPrefService2.manifest',
|
||||
]
|
||||
|
||||
EXTRA_JS_MODULES += [
|
||||
'ContentPrefService2.jsm',
|
||||
'ContentPrefServiceChild.jsm',
|
||||
'ContentPrefServiceParent.jsm',
|
||||
'ContentPrefStore.jsm',
|
||||
'ContentPrefUtils.jsm',
|
||||
]
|
||||
|
||||
XPCOM_MANIFESTS += [
|
||||
'components.conf',
|
||||
]
|
||||
|
||||
with Files('**'):
|
||||
BUG_COMPONENT = ('Toolkit', 'Preferences')
|
||||
|
Loading…
Reference in New Issue
Block a user