Bug 841243 - Followup fix for the captive portal changes. r=fabrice, a=shira+
authorShih-Chiang Chien <schien@mozilla.com>
Fri, 15 Feb 2013 14:26:58 -0800
changeset 118558 fce6e0f617821325f5ba5f584c9f21d40a4ed4ba
parent 118557 f6b38063d26f18d95d3bf0487de2a5e830781cba
child 118559 059a7e0badf720f04e460fc17638b871722a06c7
push id14
push userryanvm@gmail.com
push dateSat, 16 Feb 2013 15:33:09 +0000
reviewersfabrice, shira
bugs841243
milestone18.0
Bug 841243 - Followup fix for the captive portal changes. r=fabrice, a=shira+
b2g/chrome/content/shell.js
b2g/confvars.sh
dom/system/gonk/NetworkManager.js
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -64,19 +64,19 @@ XPCOMUtils.defineLazyGetter(this, "ppmm"
 
 #ifdef MOZ_WIDGET_GONK
 XPCOMUtils.defineLazyGetter(this, "libcutils", function () {
   Cu.import("resource://gre/modules/systemlibs.js");
   return libcutils;
 });
 #endif
 
-#ifdef MOZ_SERVICES_CAPTIVEDETECT
+#ifdef MOZ_CAPTIVEDETECT
 XPCOMUtils.defineLazyServiceGetter(Services, 'captivePortalDetector',
-                                  '@mozilla.org/services/captive-detector;1',
+                                  '@mozilla.org/toolkit/captive-detector;1',
                                   'nsICaptivePortalDetector');
 #endif
 
 function getContentWindow() {
   return shell.contentBrowser.contentWindow;
 }
 
 function debug(str) {
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -15,17 +15,17 @@ MOZ_B2G_OS_NAME=Boot2Gecko
 
 MOZ_BRANDING_DIRECTORY=b2g/branding/unofficial
 MOZ_OFFICIAL_BRANDING_DIRECTORY=b2g/branding/official
 # MOZ_APP_DISPLAYNAME is set by branding/configure.sh
 
 MOZ_SAFE_BROWSING=
 MOZ_SERVICES_COMMON=1
 MOZ_SERVICES_METRICS=1
-MOZ_SERVICES_CAPTIVEDETECT=1
+MOZ_CAPTIVEDETECT=1
 
 MOZ_WEBSMS_BACKEND=1
 MOZ_DISABLE_DOMCRYPTO=1
 MOZ_APP_STATIC_INI=1
 
 if test "$OS_TARGET" = "Android"; then
 MOZ_CAPTURE=1
 MOZ_RAW=1
--- a/dom/system/gonk/NetworkManager.js
+++ b/dom/system/gonk/NetworkManager.js
@@ -837,17 +837,17 @@ NetworkManager.prototype = {
 
 let CaptivePortalDetectionHelper = (function() {
 
   const EVENT_CONNECT = "Connect";
   const EVENT_DISCONNECT = "Disconnect";
   let _ongoingInterface = null;
   let _available = ("nsICaptivePortalDetector" in Ci);
   let getService = function () {
-    return Cc['@mozilla.org/services/captive-detector;1'].getService(Ci.nsICaptivePortalDetector);
+    return Cc['@mozilla.org/toolkit/captive-detector;1'].getService(Ci.nsICaptivePortalDetector);
   };
 
   let _performDetection = function (interfaceName, callback) {
     let capService = getService();
     let capCallback = {
       QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]),
       prepare: function prepare() {
         capService.finishPreparation(interfaceName);