Bug 747041. Fix resource:// path usage in browser. r=felipe a=desktop-only
authorTakanori MATSUURA <t.matsuu@gmail.com>
Sun, 22 Apr 2012 14:27:05 -0700
changeset 92106 c823e4f030174242f6f22495e5115a1dbe554a17
parent 92101 ce9fff905894b2d253c4d9cb496e286f6f801d6a
child 92107 3dd8420155656203c86e19299631742c17968923
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersfelipe, desktop-only
bugs747041
milestone14.0a1
Bug 747041. Fix resource:// path usage in browser. r=felipe a=desktop-only
browser/base/content/browser.js
browser/modules/WebappsInstaller.jsm
browser/modules/webappsUI.jsm
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -152,17 +152,17 @@ XPCOMUtils.defineLazyGetter(window, "gFi
   return this.PluralForm;
 });
 __defineSetter__("PluralForm", function (val) {
   delete this.PluralForm;
   return this.PluralForm = val;
 });
 
 XPCOMUtils.defineLazyModuleGetter(this, "TelemetryStopwatch",
-                                  "resource:///modules/TelemetryStopwatch.jsm");
+                                  "resource://gre/modules/TelemetryStopwatch.jsm");
 
 #ifdef MOZ_SERVICES_SYNC
 XPCOMUtils.defineLazyGetter(this, "Weave", function() {
   let tmp = {};
   Cu.import("resource://services-sync/main.js", tmp);
   return tmp.Weave;
 });
 #endif
--- a/browser/modules/WebappsInstaller.jsm
+++ b/browser/modules/WebappsInstaller.jsm
@@ -3,19 +3,19 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 let EXPORTED_SYMBOLS = ["WebappsInstaller"];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
-Cu.import("resource:///modules/Services.jsm");
-Cu.import("resource:///modules/FileUtils.jsm");
-Cu.import("resource:///modules/NetUtil.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/FileUtils.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 let WebappsInstaller = {
   /**
    * Creates a native installation of the web app in the OS
    *
    * @param aData the manifest data provided by the web app
    *
    * @returns bool true on success, false if an error was thrown
--- a/browser/modules/webappsUI.jsm
+++ b/browser/modules/webappsUI.jsm
@@ -6,17 +6,17 @@ let EXPORTED_SYMBOLS = ["webappsUI"];
 
 let Ci = Components.interfaces;
 let Cc = Components.classes;
 let Cu = Components.utils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Webapps.jsm");
-Cu.import("resource://gre/modules/WebappsInstaller.jsm");
+Cu.import("resource:///modules/WebappsInstaller.jsm");
 
 let webappsUI = {
   init: function webappsUI_init() {
     Services.obs.addObserver(this, "webapps-ask-install", false);
     Services.obs.addObserver(this, "webapps-launch", false);
   },
   
   uninit: function webappsUI_uninit() {