Bug 562706 - Start using PlacesUtils.jsm instead of utils.js [r=mfinkle]
--- a/mobile/chrome/content/browser-ui.js
+++ b/mobile/chrome/content/browser-ui.js
@@ -39,17 +39,17 @@
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGetter(this, "PluralForm", function() {
Cu.import("resource://gre/modules/PluralForm.jsm");
return PluralForm;
});
XPCOMUtils.defineLazyGetter(this, "PlacesUtils", function() {
- Cu.import("resource://gre/modules/utils.js");
+ Cu.import("resource://gre/modules/PlacesUtils.js");
return PlacesUtils;
});
const TOOLBARSTATE_LOADING = 1;
const TOOLBARSTATE_LOADED = 2;
[
[
--- a/mobile/components/BrowserStartup.js
+++ b/mobile/components/BrowserStartup.js
@@ -95,17 +95,17 @@ BrowserStartup.prototype = {
// caring about users migrating to current builds with pre-1.0 profiles.
let annos = Cc["@mozilla.org/browser/annotation-service;1"].
getService(Ci.nsIAnnotationService);
let mobileRootItems = annos.getItemsWithAnnotation("mobile/bookmarksRoot", {});
if (mobileRootItems.length > 0)
return; // no need to do initial import
}
- Cu.import("resource://gre/modules/utils.js");
+ Cu.import("resource://gre/modules/PlacesUtils.js");
try {
let observer = {
onStreamComplete : function(aLoader, aContext, aStatus, aLength, aResult) {
let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].
createInstance(Ci.nsIScriptableUnicodeConverter);
let jsonStr = "";
try {