Bug 977051 - rename manifestUrl property to manifestURL in more places; r=wesj.
authorMyk Melez <myk@mozilla.org>
Fri, 28 Feb 2014 13:43:13 -0800
changeset 171348 f34906f9fe7a2ac5c997021611ccd240096ba964
parent 171347 f7cb821abd1a9de409849d44d7bec67bc134c0d8
child 171349 4e626667330249d7889ce63f43992df72aa6677c
push id26324
push useremorley@mozilla.com
push dateMon, 03 Mar 2014 14:45:05 +0000
treeherdermozilla-central@73ab6437a1de [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswesj
bugs977051
milestone30.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 977051 - rename manifestUrl property to manifestURL in more places; r=wesj.
mobile/android/modules/WebappManager.jsm
--- a/mobile/android/modules/WebappManager.jsm
+++ b/mobile/android/modules/WebappManager.jsm
@@ -184,31 +184,31 @@ this.WebappManager = {
       // We don't have to do anything, as the registry does all the work.
       return;
     }
 
     // TODO: uninstall the APK.
   },
 
   autoInstall: function(aData) {
-    let oldApp = DOMApplicationRegistry.getAppByManifestURL(aData.manifestUrl);
+    let oldApp = DOMApplicationRegistry.getAppByManifestURL(aData.manifestURL);
     if (oldApp) {
       // If the app is already installed, update the existing installation.
       this._autoUpdate(aData, oldApp);
       return;
     }
 
     let mm = {
       sendAsyncMessage: function (aMessageName, aData) {
         // TODO hook this back to Java to report errors.
         log("sendAsyncMessage " + aMessageName + ": " + JSON.stringify(aData));
       }
     };
 
-    let origin = Services.io.newURI(aData.manifestUrl, null, null).prePath;
+    let origin = Services.io.newURI(aData.manifestURL, null, null).prePath;
 
     let message = aData.request || {
       app: {
         origin: origin,
         receipts: [],
       }
     };
 
@@ -217,17 +217,17 @@ this.WebappManager = {
         aData.updateManifest.package_path = aData.zipFilePath;
       }
       message.app.updateManifest = aData.updateManifest;
     }
 
     // The manifest url may be subtly different between the
     // time the APK was built and the APK being installed.
     // Thus, we should take the APK as the source of truth.
-    message.app.manifestURL = aData.manifestUrl;
+    message.app.manifestURL = aData.manifestURL;
     message.app.manifest = aData.manifest;
     message.app.apkPackageName = aData.apkPackageName;
     message.profilePath = aData.profilePath;
     message.autoInstall = true;
     message.mm = mm;
 
     DOMApplicationRegistry.registryReady.then(() => {
       switch (aData.type) { // can be hosted or packaged.