wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 852782 - update URL to final health report URL, r=MattN

Browse Source
This commit is contained in:
Mike Connor 2013-03-24 00:29:41 -04:00
parent 9bd0f6aa25
commit c60acf2d88
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
browser/base/content/abouthealthreport/abouthealth.js
View File

@ -29,11 +29,16 @@ let healthReportWrapper = {
let iframe = document.getElementById("remote-report");
iframe.addEventListener("load", healthReportWrapper.initRemotePage, false);
let report = Services.io.newURI(prefs.get("about.reportUrl"), null, null);
let report = this._getReportURI();
iframe.src = report.spec;
prefs.observe("uploadEnabled", this.updatePrefState, healthReportWrapper);
},
_getReportURI: function () {
let url = Services.urlFormatter.formatURLPref("datareporting.healthreport.about.reportUrl");
return Services.io.newURI(url, null, null);
},
onOptIn: function () {
policy.recordHealthReportUploadEnabled(true,
"Health report page sent opt-in command.");
@ -67,7 +72,7 @@ let healthReportWrapper = {
},
injectData: function (type, content) {
let report = Services.io.newURI(prefs.get("about.reportUrl"), null, null);
let report = this._getReportURI();
// file URIs can't be used for targetOrigin, so we use "*" for this special case
// in all other cases, pass in the URL to the report so we properly restrict the message dispatch

3
services/healthreport/healthreport-prefs.js
View File

@ -29,5 +29,4 @@ pref("datareporting.healthreport.service.providerCategories",
#endif
);
pref("datareporting.healthreport.about.glossaryUrl", "https://services.mozilla.com/healthreport/glossary.html");
pref("datareporting.healthreport.about.reportUrl", "https://services.mozilla.com/healthreport/placeholder.html");
pref("datareporting.healthreport.about.reportUrl", "https://fhr.cdn.mozilla.net/%LOCALE%/");