Commit bc1efc78 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by Richard Pospesel
Browse files

fixup! Bug 16940: After update, load local change notes. 

Bug 41668: Port some updater patches to Base Browser

Renamed TOR_BROWSER_UPDATE to BASE_BROWSER_UPDATE.
parent c9c4328b

browser/actors/moz.build

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ BROWSER_CHROME_MANIFESTS += [ 
    "test/browser/browser.ini",

]



if CONFIG["TOR_BROWSER_UPDATE"]:

if CONFIG["BASE_BROWSER_UPDATE"]:

    FINAL_TARGET_FILES.actors += [

        "AboutTBUpdateChild.jsm",

        "AboutTBUpdateParent.jsm",

browser/base/content/browser.js

+1 −1
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ var gInitialPages = [ 
  "about:welcomeback",

];



if (AppConstants.TOR_BROWSER_UPDATE) {

if (AppConstants.BASE_BROWSER_UPDATE) {

  gInitialPages.push("about:tbupdate");

}

browser/base/jar.mn

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ browser.jar: 
        content/browser/aboutTabCrashed.css           (content/aboutTabCrashed.css)

        content/browser/aboutTabCrashed.js            (content/aboutTabCrashed.js)

        content/browser/aboutTabCrashed.xhtml         (content/aboutTabCrashed.xhtml)

#ifdef TOR_BROWSER_UPDATE

#ifdef BASE_BROWSER_UPDATE

        content/browser/abouttbupdate/aboutTBUpdate.xhtml    (content/abouttbupdate/aboutTBUpdate.xhtml)

        content/browser/abouttbupdate/aboutTBUpdate.js       (content/abouttbupdate/aboutTBUpdate.js)

        content/browser/abouttbupdate/aboutTBUpdate.css      (content/abouttbupdate/aboutTBUpdate.css)

browser/components/BrowserContentHandler.jsm

+2 −8
Original line number Diff line number Diff line
@@ -743,20 +743,14 @@ nsBrowserContentHandler.prototype = { 
              "%OLD_TOR_BROWSER_VERSION%",

              old_tbversion

            );

#ifdef TOR_BROWSER_UPDATE

            if (overridePage)

            {

            if (overridePage && AppConstants.BASE_BROWSER_UPDATE) {

              prefb.setCharPref("torbrowser.post_update.url", overridePage);

              prefb.setBoolPref("torbrowser.post_update.shouldNotify", true);

              // If the user's homepage is about:tor, we will inform them

              // about the update on that page; otherwise, we arrange to

              // open about:tor in a secondary tab.

              if (startPage === "about:tor")

                overridePage = "";

              else

                overridePage = "about:tor";

              overridePage = startPage === "about:tor" ? "" : "about:tor";

            }

#endif

            break;

          case OVERRIDE_NEW_BUILD_ID:

            if (UpdateManager.readyUpdate) {

browser/components/BrowserGlue.jsm

+1 −1
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ let JSWINDOWACTORS = { 
  },

};



if (AppConstants.TOR_BROWSER_UPDATE) {

if (AppConstants.BASE_BROWSER_UPDATE) {

  JSWINDOWACTORS.AboutTBUpdate = {

    parent: {

      moduleURI: "resource:///actors/AboutTBUpdateParent.jsm",