Bug 882319 - Page load fixes for first release. r=nalexander
authorRichard Newman <rnewman@mozilla.com>
Wed, 12 Jun 2013 16:17:48 -0700
changeset 134882 0c890f39dfa6cd1ff1f0fabe7a3242bb8ab84230
parent 134881 4ae3e1cede0a3495431e75f6ee7515e7a417926f
child 134883 3dbc486831a4805bfe05199a90f4e4fc62860533
push id24816
push useremorley@mozilla.com
push dateThu, 13 Jun 2013 09:27:57 +0000
treeherdermozilla-central@7ace61b0e3e4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs882319
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 882319 - Page load fixes for first release. r=nalexander
mobile/android/chrome/content/aboutHealthReport.js
--- a/mobile/android/chrome/content/aboutHealthReport.js
+++ b/mobile/android/chrome/content/aboutHealthReport.js
@@ -68,17 +68,17 @@ let healthReportWrapper = {
 
   onOptOut: function () {
     console.log("AboutHealthReport: page sent opt-out command.");
     sharedPrefs.setBoolPref(PREF_UPLOAD_ENABLED, false);
     this.updatePrefState();
   },
 
   updatePrefState: function () {
-    console.log("AboutHealthReport: page requested pref state.");
+    console.log("AboutHealthReport: sending pref state to page.");
     try {
       let prefs = {
         enabled: sharedPrefs.getBoolPref(PREF_UPLOAD_ENABLED),
       };
       this.injectData("prefs", prefs);
     } catch (e) {
       this.reportFailure(this.ERROR_PREFS_FAILED);
     }
@@ -137,17 +137,17 @@ let healthReportWrapper = {
     }
   },
 
   initRemotePage: function () {
     let iframe = document.getElementById("remote-report").contentDocument;
     iframe.addEventListener("RemoteHealthReportCommand",
                             function onCommand(e) {healthReportWrapper.handleRemoteCommand(e);},
                             false);
-    healthReportWrapper.updatePrefState();
+    healthReportWrapper.injectData("begin", null);
   },
 
   // error handling
   ERROR_INIT_FAILED:    1,
   ERROR_PAYLOAD_FAILED: 2,
   ERROR_PREFS_FAILED:   3,
 
   reportFailure: function (error) {