DB-2411: fix freshtab url load

Author: aleksei-cliqz

mozilla-release/browser/base/content/browser.js

@@ -659,9 +659,6 @@ var gInitialPages = [
   "about:cliqz",
   "about:welcome",
   "about:newinstall",
-#endif
-  CliqzResources.getFreshTabUrl(),
-#if 0
 ];
 
 function isInitialPage(url) {
@@ -2265,11 +2262,33 @@ var gBrowserInit = {
         return;
       }
 
+      let aboutNewTabURL = gAboutNewTabService.defaultURL;
+      if (aboutNewTabURL === "about:newtab") {
+        // CLIQZ-SPECIAL: DB-2411, we assign moz-extension url to newTabURL in AboutNewTabService;
+        // Sometimes it gets reset to default value "about:newtab" resetting
+        // the value having come from the extension.
+        // We need this hack for that kind of problem.
+        // TODO: find cases when newTabURL is reset.
+        // See AboutNewTabService#setter newTabURL;
+        aboutNewTabURL = CliqzResources.whatIstheURL('freshtab/home.html');
+      }
+
       // We don't check if uriToLoad is a XULElement because this case has
       // already been handled before first paint, and the argument cleared.
       if (Array.isArray(uriToLoad)) {
         // This function throws for certain malformed URIs, so use exception handling
         // so that we don't disrupt startup
+
+        // CLIQZ-SPECIAL: DB-2411, we should not load a freshtab url directly here.
+        // Instead we delegate it to AboutRedirector.cpp.
+        // That is any uri which is explicitly set as a freshtab moz-extension we
+        // assign a default home page value as a string (in most cases about:home);
+        // gAboutNewTabService.defaultURL has an explicit freshtab url.
+        // Same rule is applicable for other two cases below.
+        uriToLoad = uriToLoad.map((uri) => {
+          return uri === aboutNewTabURL ? HomePage.getAsString(true) : uri;
+        });
+
         try {
           gBrowser.loadTabs(uriToLoad, {
             inBackground: false,
@@ -2285,6 +2304,8 @@ var gBrowserInit = {
           });
         } catch (e) {}
       } else if (window.arguments.length >= 3) {
+        // CLIQZ-SPECIAL: DB-2411
+        uriToLoad = uriToLoad === aboutNewTabURL ? HomePage.getAsString(true) : uriToLoad;
         // window.arguments[1]: unused (bug 871161)
         //                 [2]: referrerInfo (nsIReferrerInfo)
         //                 [3]: postData (nsIInputStream)
@@ -2318,6 +2339,8 @@ var gBrowserInit = {
         );
         window.focus();
       } else {
+        // CLIQZ-SPECIAL: DB-2411
+        uriToLoad = uriToLoad === aboutNewTabURL ? HomePage.getAsString(true) : uriToLoad;
         // Note: loadOneOrMoreURIs *must not* be called if window.arguments.length >= 3.
         // Such callers expect that window.arguments[0] is handled as a single URI.
         loadOneOrMoreURIs(

mozilla-release/browser/components/CliqzResources.jsm

@@ -39,7 +39,7 @@ const CliqzResources = {
       case 'chrome://cliqz/content/onboarding-v3/index.html':
       case 'resource://cliqz/freshtab/home.html':
       case 'about:welcome':
-        return this.getFreshTabUrl();
+        return 'about:home';
 
       default:
         return key;
@@ -67,7 +67,6 @@ const CliqzResources = {
   },
   whatIstheURL: (u) => `${getWebExtPrefix()}/modules/${u}`,
   getExtensionURL: (path, extensionId = DEFAULT_EXTENSION_ID) => `${getWebExtPrefix(extensionId)}${path}`,
-  getFreshTabUrl: () => `${getWebExtPrefix()}/modules/freshtab/home.html`,
   getUrlWithProperExtentionId: function(url = '') {
     if (!url || typeof url != 'string') {
       return url;

mozilla-release/browser/components/newtab/AboutNewTabService.jsm

@@ -265,7 +265,7 @@ AboutNewTabService.prototype = {
       const results = Services.cpmm.sendSyncMessage("AboutNewTabService:Parent:getStartupFreshtabUrl");
       return results[0];
     } else {
-      this.newTabURL;
+      return this.newTabURL;
     }
 #if 0
     return [

mozilla-release/browser/modules/HomePage.jsm

@@ -53,19 +53,6 @@ function getHomepagePref(useDefault) {
     homePage = getHomepagePref(true);
   }
 
-  if (homePage === kDefaultHomePage) {
-    // CLIQZ-SPECIAL: in case of homePage ends up with "about:home"
-    // this url will be handled by AboutRedirector.cpp which in turn
-    // will go to AboutNewTabService to get a defaultUrl value.
-    // Then this value will be retrieved from extension manifest.json.
-    // To workaround that path we can get the freshtab url from
-    // CliqzResources.
-    const { CliqzResources } = ChromeUtils.import(
-      "resource:///modules/CliqzResources.jsm"
-    );
-    homePage = CliqzResources.getFreshTabUrl();
-  }
-
   return homePage;
 }
 

mozilla-release/toolkit/components/extensions/webrequest/WebRequest.jsm

@@ -23,10 +23,6 @@ const { PrivateBrowsingUtils } = ChromeUtils.import(
 const autoForgetTabs= Cc["@cliqz.com/browser/auto_forget_tabs_service;1"].
     getService(Ci.nsISupports).wrappedJSObject;
 
-const { CliqzResources } = ChromeUtils.import(
-  "resource:///modules/CliqzResources.jsm"
-);
-
 XPCOMUtils.defineLazyModuleGetters(this, {
   ExtensionUtils: "resource://gre/modules/ExtensionUtils.jsm",
   WebRequestUpload: "resource://gre/modules/WebRequestUpload.jsm",
@@ -708,7 +704,6 @@ HttpObserverManager = {
       const { finalURL, originURL } = channel;
       const { gBrowser, openLinkIn, openTrustedLinkIn } = channel.browserElement.ownerGlobal;
       const { selectedTab, tabs = [] } = gBrowser;
-      const freshTabURL = CliqzResources.getFreshTabUrl();
       const otherWin = openLinkIn(
         finalURL,
         "window",
@@ -757,7 +752,7 @@ HttpObserverManager = {
           // Deletes the tab if there is no history path
           if (!gBrowser.webNavigation.canGoBack) {
             if (tabs.length === 1) {
-              openTrustedLinkIn(freshTabURL, "tab");
+              openTrustedLinkIn("about:home", "tab");
             }
             gBrowser.removeTab(selectedTab);
           }