Bug 1251362 - DON'T LAND - Debug temp: If the startup tab restore setting is set to "Never", always try switching to the recent tabs panel on startup, so we can test the code path for redirecting this to the combined history panel. draft
authorJan Henning <jh+bugzilla@buttercookie.de>
Sun, 15 May 2016 01:42:16 +0200
changeset 376088 9f8611e273c9ebf6019001d58bd75065ac1c05ee
parent 376087 48b7556c94e3c99ac36da7e7417484d4b3855b59
child 523079 21a6e142d10edb17fbb7d046c8f034921fa998e1
push id20500
push usermozilla@buttercookie.de
push dateTue, 07 Jun 2016 11:41:20 +0000
bugs1251362, 1263110
milestone50.0a1
Bug 1251362 - DON'T LAND - Debug temp: If the startup tab restore setting is set to "Never", always try switching to the recent tabs panel on startup, so we can test the code path for redirecting this to the combined history panel. Normally, this is only used by the crash loop protection (see bug 1263110). MozReview-Commit-ID: BxTlsfi1HUt
mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
@@ -1455,24 +1455,24 @@ public abstract class GeckoApp
      * tab will be about:home, or the homepage if the user has set one.
      * If we've temporarily disabled restoring to break out of a crash loop, we'll show
      * the Recent Tabs folder of the Combined History panel, so the user can manually
      * restore tabs as needed.
      * If we restore tabs, we don't need to create a new tab.
      */
     protected void loadStartupTab(final int flags) {
         if (!mShouldRestore) {
-            if (mLastSessionCrashed) {
+            //if (mLastSessionCrashed) {
                 // The Recent Tabs panel no longer exists, but BrowserApp will redirect us
                 // to the Recent Tabs folder of the Combined History panel.
                 Tabs.getInstance().loadUrl(AboutPages.getURLForBuiltinPanelType(PanelType.DEPRECATED_RECENT_TABS), flags);
-            } else {
-                final String homepage = getHomepage();
-                Tabs.getInstance().loadUrl(!TextUtils.isEmpty(homepage) ? homepage : AboutPages.HOME, flags);
-            }
+            //} else {
+                //final String homepage = getHomepage();
+                //Tabs.getInstance().loadUrl(!TextUtils.isEmpty(homepage) ? homepage : AboutPages.HOME, flags);
+            //}
         }
     }
 
     /**
      * Loads the initial tab at Fennec startup. This tab will load with the given
      * external URL. If that URL is invalid, a startup tab will be loaded.
      *
      * @param url    External URL to load.