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

Bug 1524688: Part 27 - Convert TelemetryStartup to static registration. r=gfritzsche

Browse Source 
--HG--
rename : toolkit/components/telemetry/TelemetryStartup.js => toolkit/components/telemetry/TelemetryStartup.jsm
extra : source : ff120b4eeb79dac8a4d69168521386947ac3de83
This commit is contained in:
Kris Maglione 2019-01-29 21:29:25 -08:00
parent 38678a1c70
commit 45f284a401
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,8 +234,6 @@
@RESPATH@/components/servicesSettings.manifest
@RESPATH@/components/RemoteSettingsComponents.js
@RESPATH@/components/cryptoComponents.manifest
@RESPATH@/components/TelemetryStartup.js
@RESPATH@/components/TelemetryStartup.manifest
@RESPATH@/components/recording-cmdline.js
@RESPATH@/components/recording-cmdline.manifest
@RESPATH@/components/htmlMenuBuilder.js

5
mobile/android/installer/package-manifest.in
View File

@ -156,11 +156,6 @@
@BINPATH@/components/servicesSettings.manifest
@BINPATH@/components/RemoteSettingsComponents.js
#ifndef MOZ_GECKOVIEW_JAR
@BINPATH@/components/TelemetryStartup.js
@BINPATH@/components/TelemetryStartup.manifest
#endif
@BINPATH@/components/htmlMenuBuilder.js
@BINPATH@/components/htmlMenuBuilder.manifest

5
toolkit/components/telemetry/TelemetryStartup.js → toolkit/components/telemetry/TelemetryStartup.jsm
View File

@ -5,8 +5,6 @@
"use strict";
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", this);
ChromeUtils.defineModuleGetter(this, "TelemetryController",
"resource://gre/modules/TelemetryController.jsm");
ChromeUtils.defineModuleGetter(this, "TelemetryEnvironment",
@ -19,7 +17,6 @@ ChromeUtils.defineModuleGetter(this, "TelemetryEnvironment",
function TelemetryStartup() {
}
TelemetryStartup.prototype.classID = Components.ID("{117b219f-92fe-4bd2-a21b-95a342a9d474}");
TelemetryStartup.prototype.QueryInterface = ChromeUtils.generateQI([Ci.nsIObserver]);
TelemetryStartup.prototype.observe = function(aSubject, aTopic, aData) {
if (aTopic == "profile-after-change") {
@ -45,4 +42,4 @@ function annotateEnvironment() {
}
}
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([TelemetryStartup]);
var EXPORTED_SYMBOLS = ["TelemetryStartup"];

3
toolkit/components/telemetry/TelemetryStartup.manifest
View File

@ -1,3 +0,0 @@
component {117b219f-92fe-4bd2-a21b-95a342a9d474} TelemetryStartup.js
contract @mozilla.org/base/telemetry-startup;1 {117b219f-92fe-4bd2-a21b-95a342a9d474}
category profile-after-change TelemetryStartup @mozilla.org/base/telemetry-startup;1 process=main

16
toolkit/components/telemetry/components.conf Normal file
View File

@ -0,0 +1,16 @@
# -*- 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': '{117b219f-92fe-4bd2-a21b-95a342a9d474}',
'contract_ids': ['@mozilla.org/base/telemetry-startup;1'],
'jsm': 'resource://gre/modules/TelemetryStartup.jsm',
'constructor': 'TelemetryStartup',
'categories': {'profile-after-change': 'TelemetryStartup'},
'processes': ProcessSelector.MAIN_PROCESS_ONLY,
},
]

7
toolkit/components/telemetry/moz.build
View File

@ -94,14 +94,10 @@ if CONFIG['MOZ_GECKO_PROFILER']:
]
XPCOM_MANIFESTS += [
'components.conf',
'core/components.conf',
]
EXTRA_COMPONENTS += [
'TelemetryStartup.js',
'TelemetryStartup.manifest'
]
EXTRA_JS_MODULES += [
'app/TelemetryArchive.jsm',
'app/TelemetryController.jsm',
@ -120,6 +116,7 @@ EXTRA_JS_MODULES += [
'pings/TelemetrySession.jsm',
'pings/UntrustedModulesPing.jsm',
'pings/UpdatePing.jsm',
'TelemetryStartup.jsm',
]
TESTING_JS_MODULES += [