Bug 1235107 - Move bookmarks.html to a chrome localized location

Gbp-Pq: Topic fixes
Gbp-Pq: Name Bug-1235107-Move-bookmarks.html-to-a-chrome-localize.patch

diff --git a/browser/components/migration/MigrationUtils.jsm b/browser/components/migration/MigrationUtils.jsm
index 6af635bfb6a5da5ed3777ab7992be6952e5ce26f..472e60dc9441bd6a4e2ecac162cb839b17f41d7d 100644 (file)
--- a/browser/components/migration/MigrationUtils.jsm
+++ b/browser/components/migration/MigrationUtils.jsm
@@ -291,7 +291,7 @@ this.MigratorPrototype = {
           doMigrate();
         };
         BookmarkHTMLUtils.importFromURL(
-          "resource:///defaults/profile/bookmarks.html", true).then(
+          "chrome://browser/locale/bookmarks.html", true).then(
           onImportComplete, onImportComplete);
         return;
       }

diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index 0759472076f760d7051da3de940baa2c62ec71d3..233d473b53c8380ca5b5f87a0eabb6307645c673 100644 (file)
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -1745,7 +1745,7 @@ BrowserGlue.prototype = {
         let bookmarksUrl = null;
         if (restoreDefaultBookmarks) {
           // User wants to restore bookmarks.html file from default profile folder
-          bookmarksUrl = "resource:///defaults/profile/bookmarks.html";
+          bookmarksUrl = "chrome://browser/locale/bookmarks.html";
         }
         else if (yield OS.File.exists(BookmarkHTMLUtils.defaultPath)) {
           bookmarksUrl = OS.Path.toFileURI(BookmarkHTMLUtils.defaultPath);

diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 5b1803a2d41c0dbf6d020cf8ffc12694bd4ca612..ea6d3f070bbff8e9f44b2f3af1abc50ac018130f 100644 (file)
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -46,7 +46,6 @@
 @RESPATH@/browser/chrome/@AB_CD@.manifest
 @RESPATH@/chrome/@AB_CD@@JAREXT@
 @RESPATH@/chrome/@AB_CD@.manifest
-@RESPATH@/browser/defaults/profile/bookmarks.html
 @RESPATH@/browser/defaults/profile/chrome/*
 @RESPATH@/browser/defaults/profile/localstore.rdf
 @RESPATH@/browser/defaults/profile/mimeTypes.rdf

diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
index a34dfb3da1ab9a5c31d7c2d56298d79947e6fb67..e85ad92ec495fc5854f6ec126b2fbe1bf2ebe04c 100644 (file)
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -110,14 +110,14 @@ PROFILE_CHROME = userChrome-example.css userContent-example.css
 
 NO_JA_JP_MAC_AB_CD := $(if $(filter ja-JP-mac, $(AB_CD)),ja,$(AB_CD))
 
-%/defaults/profile/bookmarks.html: bookmarks.inc generic/profile/bookmarks.html.in
+%/chrome/$(AB_CD)/locale/browser/bookmarks.html: bookmarks.inc generic/profile/bookmarks.html.in
        $(call py_action,preprocessor, \
          -I $< \
          -DAB_CD=$(NO_JA_JP_MAC_AB_CD) \
          $(srcdir)/generic/profile/bookmarks.html.in \
          -o $@)
 
-libs:: $(FINAL_TARGET)/defaults/profile/bookmarks.html ;
+libs:: $(FINAL_TARGET)/chrome/$(AB_CD)/locale/browser/bookmarks.html ;
 
 libs:: $(addprefix generic/profile/,$(PROFILE_FILES))
        $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile