зеркало из https://github.com/mozilla/gecko-dev.git
Bug 772143 - Remove carriage returns from TelemetryPing. r=nfroyd
This commit is contained in:
Родитель
ada0483eb3
Коммит
6fb9d88ae3
|
@ -739,12 +739,12 @@ TelemetryPing.prototype = {
|
||||||
},
|
},
|
||||||
|
|
||||||
getFlashVersion: function getFlashVersion() {
|
getFlashVersion: function getFlashVersion() {
|
||||||
let host = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
|
let host = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
|
||||||
let tags = host.getPluginTags();
|
let tags = host.getPluginTags();
|
||||||
|
|
||||||
for (let i = 0; i < tags.length; i++) {
|
for (let i = 0; i < tags.length; i++) {
|
||||||
if (tags[i].name == "Shockwave Flash")
|
if (tags[i].name == "Shockwave Flash")
|
||||||
return tags[i].version;
|
return tags[i].version;
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
|
|
@ -328,37 +328,37 @@ function dummyTheme(id) {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// A fake plugin host for testing flash version telemetry
|
// A fake plugin host for testing flash version telemetry
|
||||||
var PluginHost = {
|
var PluginHost = {
|
||||||
getPluginTags: function(countRef) {
|
getPluginTags: function(countRef) {
|
||||||
let plugins = [{name: "Shockwave Flash", version: FLASH_VERSION}];
|
let plugins = [{name: "Shockwave Flash", version: FLASH_VERSION}];
|
||||||
countRef.value = plugins.length;
|
countRef.value = plugins.length;
|
||||||
return plugins;
|
return plugins;
|
||||||
},
|
},
|
||||||
|
|
||||||
QueryInterface: function(iid) {
|
QueryInterface: function(iid) {
|
||||||
if (iid.equals(Ci.nsIPluginHost)
|
if (iid.equals(Ci.nsIPluginHost)
|
||||||
|| iid.equals(Ci.nsISupports))
|
|| iid.equals(Ci.nsISupports))
|
||||||
return this;
|
return this;
|
||||||
|
|
||||||
throw Components.results.NS_ERROR_NO_INTERFACE;
|
throw Components.results.NS_ERROR_NO_INTERFACE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var PluginHostFactory = {
|
var PluginHostFactory = {
|
||||||
createInstance: function (outer, iid) {
|
createInstance: function (outer, iid) {
|
||||||
if (outer != null)
|
if (outer != null)
|
||||||
throw Components.results.NS_ERROR_NO_AGGREGATION;
|
throw Components.results.NS_ERROR_NO_AGGREGATION;
|
||||||
return PluginHost.QueryInterface(iid);
|
return PluginHost.QueryInterface(iid);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const PLUGINHOST_CONTRACTID = "@mozilla.org/plugin/host;1";
|
const PLUGINHOST_CONTRACTID = "@mozilla.org/plugin/host;1";
|
||||||
const PLUGINHOST_CID = Components.ID("{2329e6ea-1f15-4cbe-9ded-6e98e842de0e}");
|
const PLUGINHOST_CID = Components.ID("{2329e6ea-1f15-4cbe-9ded-6e98e842de0e}");
|
||||||
|
|
||||||
function registerFakePluginHost() {
|
function registerFakePluginHost() {
|
||||||
var registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
|
var registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
|
||||||
registrar.registerFactory(PLUGINHOST_CID, "Fake Plugin Host",
|
registrar.registerFactory(PLUGINHOST_CID, "Fake Plugin Host",
|
||||||
PLUGINHOST_CONTRACTID, PluginHostFactory);
|
PLUGINHOST_CONTRACTID, PluginHostFactory);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче